Remove additional unneeded tq method conversions

r14.0.x
Timothy Pearson 12 years ago
parent b3604f731c
commit 4744cb9332

@ -599,7 +599,7 @@ bool BT_OSISHTML::handleToken(sword::SWBuf &buf, const char *token, sword::Basic
else { // seg end tag
buf.append("</span>");
}
//qWarning(TQString("handled <seg> token. result: %1").tqarg(buf.c_str()).latin1());
//qWarning(TQString("handled <seg> token. result: %1").arg(buf.c_str()).latin1());
}
//divine name, don't use simple tag replacing because it may have attributes

@ -122,8 +122,8 @@ const TQString CDisplayTemplateMgr::fillTemplate( const TQString& name, const TQ
langCSS +=
TQString("\n*[lang=%1] %2")
.tqarg(lang->abbrev())
.tqarg(css);
.arg(lang->abbrev())
.arg(css);
}
}
@ -136,10 +136,10 @@ const TQString CDisplayTemplateMgr::fillTemplate( const TQString& name, const TQ
const TQFont standardFont = CBTConfig::getDefault(lang); //we just need a dummy lang param
langCSS.prepend(
TQString("\n#content {font-family:%1; font-size:%2pt; font-weight:%3; font-style: %4;}\n")
.tqarg(standardFont.family())
.tqarg(standardFont.pointSize())
.tqarg(standardFont.bold() ? "bold" : "normal")
.tqarg(standardFont.italic() ? "italic" : "normal")
.arg(standardFont.family())
.arg(standardFont.pointSize())
.arg(standardFont.bold() ? "bold" : "normal")
.arg(standardFont.italic() ? "italic" : "normal")
);
}

@ -51,7 +51,7 @@ namespace Rendering {
const ListCSwordModuleInfo& modules( tree->collectModules() );
if (modules.count() == 1) { //insert the direction into the sorrounding div
ret.insert( 5, TQString("dir=\"%1\" ").tqarg((modules.first()->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr" : "rtl" ));
ret.insert( 5, TQString("dir=\"%1\" ").arg((modules.first()->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr" : "rtl" ));
}
for ( KeyTreeItem* c = tree->first(); c; c = tree->next() ) {
@ -163,7 +163,7 @@ namespace Rendering {
entry.append("<span class=\"entryname\" dir=\"ltr\">").append(entryLink(i, *mod_Itr)).append("</span>");
if (m_settings.addText) {
//entry.append( TQString::fromLatin1("<span %1>%2</span>").tqarg(langAttr).tqarg(key_renderedText) );
//entry.append( TQString::fromLatin1("<span %1>%2</span>").arg(langAttr).arg(key_renderedText) );
entry.append( key_renderedText );
}

@ -248,7 +248,7 @@ const bool CReferenceManager::decodeHyperlink( const TQString& hyperlink, TQStri
}
const TQString CReferenceManager::encodeReference(const TQString &module, const TQString &reference) {
//return TQString("(%1)%2").tqarg(module).tqarg(reference);
//return TQString("(%1)%2").arg(module).arg(reference);
return TQString("(").append(module).append(")").append(reference);
}

@ -634,7 +634,7 @@ const TQStringList CSwordBackend::swordDirList() {
const TQString home = TQString(getenv("HOME"));
//return a list of used Sword dirs. Useful for the installer
TQString configPath = TQString("%1/.sword/sword.conf").tqarg(home);
TQString configPath = TQString("%1/.sword/sword.conf").arg(home);
if (!TQFile(configPath).exists()) {
configPath = globalConfPath; //e.g. /etc/sword.conf, /usr/local/etc/sword.conf

@ -111,9 +111,9 @@ const TQString CSwordKey::renderedText( const CSwordKey::TextRenderType mode ) {
text.replace(
TQRegExp( TQString(
"(>[^<>]+)" // Avoid replacing inside tags
"\\b(0*%1)\\b").tqarg(number) ), // And span around 0's
"\\b(0*%1)\\b").arg(number) ), // And span around 0's
TQString("\\1<span lemma=\"%1%2\"><a href=\"strongs://%3/%4\">\\2</a></span>")
.tqarg(langcode, paddednumber, language, paddednumber)
.arg(langcode, paddednumber, language, paddednumber)
);
pos += rx.matchedLength();
}

@ -36,7 +36,7 @@
* CSwordLDKey ldKey(m_module);
* ldKey.key("Adam");
* ldKey.nextEntry();
* qDebug( TQString("The current key is: %1").tqarg(ldKey.key()));
* qDebug( TQString("The current key is: %1").arg(ldKey.key()));
* @endcode
*
* Please not, that the result will be invalid if use the operator const char*

@ -148,7 +148,7 @@ TQStringList* const CSwordLexiconModuleInfo::entries() {
if (m_entryList->count()) {
//create cache
TQString dir = KGlobal::dirs()->saveLocation("data", "bibletime/cache/");
//TQFile f2( TQString::fromLatin1("%1/%2").tqarg(dir).tqarg( name() ) );
//TQFile f2( TQString::fromLatin1("%1/%2").arg(dir).arg( name() ) );
TQFile f2( TQString(dir).append("/").append(name()) );

@ -714,40 +714,40 @@ TQString CSwordModuleInfo::aboutText() const {
text += "<font size=\"-1\"><table>";
text += TQString("<tr><td><b>%1</b></td><td>%2</td><tr>")
.tqarg(i18n("Version"))
.tqarg(hasVersion()? config(CSwordModuleInfo::ModuleVersion) : i18n("unknown"));
.arg(i18n("Version"))
.arg(hasVersion()? config(CSwordModuleInfo::ModuleVersion) : i18n("unknown"));
text += TQString("<tr><td><b>%1</b></td><td>%2</td></tr>")
.tqarg(i18n("Markup"))
.tqarg(!TQString(m_module->getConfigEntry("SourceType")).isEmpty()? m_module->
.arg(i18n("Markup"))
.arg(!TQString(m_module->getConfigEntry("SourceType")).isEmpty()? m_module->
getConfigEntry("SourceType") : i18n("unknown").ascii());
text += TQString("<tr><td><b>%1</b></td><td>%2</td></tr>")
.tqarg(i18n("Location"))
.tqarg(config(CSwordModuleInfo::AbsoluteDataPath));
.arg(i18n("Location"))
.arg(config(CSwordModuleInfo::AbsoluteDataPath));
text += TQString("<tr><td><b>%1</b></td><td>%2</td></tr>")
.tqarg(i18n("Language"))
.tqarg(language()->translatedName());
.arg(i18n("Language"))
.arg(language()->translatedName());
if (m_module->getConfigEntry("Category"))
text += TQString("<tr><td><b>%1</b></td><td>%2</td></tr>")
.tqarg(i18n("Category"))
.tqarg(m_module->getConfigEntry("Category"));
.arg(i18n("Category"))
.arg(m_module->getConfigEntry("Category"));
if (m_module->getConfigEntry("LCSH"))
text += TQString("<tr><td><b>%1</b></td><td>%2</td></tr>")
.tqarg(i18n("LCSH"))
.tqarg(m_module->getConfigEntry("LCSH"));
.arg(i18n("LCSH"))
.arg(m_module->getConfigEntry("LCSH"));
text += TQString("<tr><td><b>%1</b></td><td>%2</td></tr>")
.tqarg(i18n("Writable"))
.tqarg(isWritable()? i18n("yes") : i18n("no"));
.arg(i18n("Writable"))
.arg(isWritable()? i18n("yes") : i18n("no"));
if (isEncrypted())
text += TQString("<tr><td><b>%1</b></td><td>%2</td></tr>")
.tqarg(i18n("Unlock key"))
.tqarg(config(CSwordModuleInfo::CipherKey));
.arg(i18n("Unlock key"))
.arg(config(CSwordModuleInfo::CipherKey));
TQString options;
@ -765,19 +765,19 @@ TQString CSwordModuleInfo::aboutText() const {
if (!options.isEmpty()) {
text += TQString("<tr><td><b>%1</b></td><td>%2</td></tr>")
.tqarg(i18n("Features"))
.tqarg(options);
.arg(i18n("Features"))
.arg(options);
}
text += "</table><hr>";
if (category() == Cult) //clearly say the module contains cult/questionable materials
text += TQString("<br/><b>%1</b><br/><br/>")
.tqarg(i18n("Take care, this work contains cult / questionable material!"));
.arg(i18n("Take care, this work contains cult / questionable material!"));
text += TQString("<b>%1:</b><br><font size=\"-1\">%2</font>")
.tqarg(i18n("About"))
.tqarg(config(AboutInformation));
.arg(i18n("About"))
.arg(config(AboutInformation));
typedef TQValueList<CSwordModuleInfo::ConfigEntry> ListConfigEntry;
@ -834,8 +834,8 @@ TQString CSwordModuleInfo::aboutText() const {
if (!t.isEmpty()) {
text += TQString("<tr><td><b>%1</b></td><td>%2</td></tr>")
.tqarg(entryMap[*it])
.tqarg(config(*it));
.arg(entryMap[*it])
.arg(config(*it));
}
}

@ -141,14 +141,14 @@ m_alternativeContent( TQString() ) {
}
else if (vk.LowerBound().Chapter() != vk.UpperBound().Chapter()) {
m_alternativeContent = TQString("%1 - %2:%3")
.tqarg(TQString::fromUtf8(vk.LowerBound().getText()))
.tqarg(vk.UpperBound().Chapter())
.tqarg(vk.UpperBound().Verse());
.arg(TQString::fromUtf8(vk.LowerBound().getText()))
.arg(vk.UpperBound().Chapter())
.arg(vk.UpperBound().Verse());
}
else { //only verses differ (same book, same chapter)
m_alternativeContent = TQString("%1 - %2")
.tqarg(TQString::fromUtf8(vk.LowerBound().getText()))
.tqarg(vk.UpperBound().Verse());
.arg(TQString::fromUtf8(vk.LowerBound().getText()))
.arg(vk.UpperBound().Verse());
}
}

@ -86,7 +86,7 @@ m_mainIndex(0) {
setPlainCaption("BibleTime " VERSION);
// we don't save the tqgeometry, it's stored in the startup profile
// we don't save the geometry, it's stored in the startup profile
setAutoSaveSettings(TQString("MainWindow"), false);
}

@ -95,7 +95,7 @@ TQStringList BibleTime::searchInModule(const TQString& moduleName, const TQStrin
mod->searchIndexed( searchText, scope );
sword::ListKey result = mod->searchResult();
const TQString lead = TQString("[%1] ").tqarg(moduleName);
const TQString lead = TQString("[%1] ").arg(moduleName);
;
for ( int i = 0; i < result.Count(); ++i ) {
sword::SWKey* key = result.getElement(i);

@ -580,7 +580,7 @@ void BibleTime::applyProfileSettings( CProfile* p ) {
Q_ASSERT(p);
if (!p) return;
if (m_initialized) { //on startup KDE sets the main tqgeometry
if (m_initialized) { //on startup KDE sets the main geometry
//see polish(), where m_initialized is set and the KDE methods are called for window resize
//first Main Window state
@ -588,9 +588,9 @@ void BibleTime::applyProfileSettings( CProfile* p ) {
toggleFullscreen(); //either showFullscreen or showNormal
if (p->maximized()) KMainWindow::showMaximized(); //if maximized, then also call showMaximized
//Then Main Window tqgeometry
KMainWindow::resize( p->tqgeometry().size() ); //Don't use KMainWindowInterface::resize
KMainWindow::move( p->tqgeometry().topLeft() );//Don't use KMainWindowInterface::move
//Then Main Window geometry
KMainWindow::resize( p->geometry().size() ); //Don't use KMainWindowInterface::resize
KMainWindow::move( p->geometry().topLeft() );//Don't use KMainWindowInterface::move
}
}
@ -602,8 +602,8 @@ void BibleTime::storeProfileSettings( CProfile* p ) {
p->setFullscreen( m_windowFullscreen_action->isChecked() );
p->setMaximized( this->KMainWindow::isMaximized() );
TQRect tqgeometry;
tqgeometry.setTopLeft(pos());
tqgeometry.setSize(size());
p->setGeometry(tqgeometry);
TQRect geometry;
geometry.setTopLeft(pos());
geometry.setSize(size());
p->setGeometry(geometry);
}

@ -41,7 +41,7 @@ namespace BookshelfManager {
const TQString BTInstallMgr::Tool::LocalConfig::swordConfigFilename() {
// Q_ASSERT( CPointers::backend()->sysconfig );
return TQString::fromLatin1("%1/.sword/sword.conf").tqarg(getenv("HOME"));
return TQString::fromLatin1("%1/.sword/sword.conf").arg(getenv("HOME"));
}
TQStringList BTInstallMgr::Tool::RemoteConfig::sourceList( sword::InstallMgr* mgr ) {
@ -102,7 +102,7 @@ namespace BookshelfManager {
for (TQStringList::const_iterator it = targets.begin(); it != targets.end(); ++it) {
TQString t = *it;
if (t.contains( TQString("%1/.sword").tqarg(getenv("HOME")) )) {
if (t.contains( TQString("%1/.sword").arg(getenv("HOME")) )) {
//we don't want HOME/.sword in the config
continue;
}
@ -117,7 +117,7 @@ namespace BookshelfManager {
if (!directAccess) { //use tdesu to move the file to the right place
KProcess *proc = new KProcess;
*proc << "tdesu";
*proc << TQString::fromLatin1("-c") << TQString("mv %1 %2").tqarg(filename).tqarg(LocalConfig::swordConfigFilename());
*proc << TQString::fromLatin1("-c") << TQString("mv %1 %2").arg(filename).arg(LocalConfig::swordConfigFilename());
proc->start(KProcess::Block);
}
}

@ -497,7 +497,7 @@ void CExportManager::setProgressRange( const int items ) {
dlg->setProgress(0);
dlg->setMinimumDuration(0);
dlg->show();
// dlg->tqrepaint();
// dlg->repaint();
KApplication::kApplication()->processEvents(); //do not lock the GUI!
}
}

@ -165,9 +165,9 @@ namespace InfoDisplay {
ret.append(
TQString("<div class=\"abbreviation\"><h3>%1: %2</h3><p>%3</p></div>")
.tqarg(i18n("Abbreviation"))
.tqarg("text")
.tqarg(text));
.arg(i18n("Abbreviation"))
.arg("text")
.arg(text));
return ret;
}
@ -176,7 +176,7 @@ namespace InfoDisplay {
Q_ASSERT(!data.isEmpty());
if (data.isEmpty()) {
return TQString("<div class=\"crossrefinfo\"><h3>%1</h3></div>")
.tqarg(i18n("Cross references"));
.arg(i18n("Cross references"));
}
// qWarning("setting crossref %s", data.latin1());
@ -269,9 +269,9 @@ namespace InfoDisplay {
// qWarning("rendered the tree: %s", renderer.renderKeyTree(tree).latin1());
//spanns containing rtl text need dir=rtl on their parent tag to be aligned properly
return TQString("<div class=\"crossrefinfo\"><h3>%1</h3><div class=\"para\" dir=\"%2\">%3</div></div>")
.tqarg(i18n("Cross references"))
.tqarg(module ? ((module->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr" : "rtl") : "")
.tqarg(renderer.renderKeyTree(tree));
.arg(i18n("Cross references"))
.arg(module ? ((module->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr" : "rtl") : "")
.arg(renderer.renderKeyTree(tree));
}
/*!
@ -310,8 +310,8 @@ namespace InfoDisplay {
));
return TQString("<div class=\"footnoteinfo\"><h3>%1</h3><p>%2</p></div>")
.tqarg(i18n("Footnote"))
.tqarg(text);
.arg(i18n("Footnote"))
.arg(text);
}
const TQString CInfoDisplay::decodeStrongs( const TQString& data ) {
@ -337,9 +337,9 @@ namespace InfoDisplay {
ret.append(
TQString("<div class=\"strongsinfo\"><h3>%1: %2</h3><p>%3</p></div>")
.tqarg(i18n("Strongs"))
.tqarg(*it)
.tqarg(text)
.arg(i18n("Strongs"))
.arg(*it)
.arg(text)
);
}
@ -372,7 +372,7 @@ namespace InfoDisplay {
// No need to check len, if at(1) is > len TQChar::null is
// returned which is ok to .isDigit()
if (value.at(1).isDigit()) {
switch (value.tqat(0).latin1()) {
switch (value.at(0).latin1()) {
case 'G':
module = CBTConfig::get
(CBTConfig::standardGreekMorphLexicon);
@ -416,9 +416,9 @@ namespace InfoDisplay {
//if the module wasn't found just display an empty morph info
ret.append( TQString("<div class=\"morphinfo\"><h3>%1: %2</h3><p>%3</p></div>")
.tqarg(i18n("Morphology"))
.tqarg(value)
.tqarg(text)
.arg(i18n("Morphology"))
.arg(value)
.arg(text)
);
}
@ -439,9 +439,9 @@ namespace InfoDisplay {
}
TQString ret = TQString("<div class=\"translationinfo\"><h3>%1: %2</h3><p>%3</p></div>")
.tqarg(i18n("Word lookup"))
.tqarg(data)
.tqarg(key->renderedText());
.arg(i18n("Word lookup"))
.arg(data)
.arg(key->renderedText());
return ret;
}

@ -103,7 +103,7 @@ void CManageIndicesWidget::populateModuleList() {
if ((*it)->hasIndex()) {
item = new TQCheckListItem(m_modsWithIndices, (*it)->name(),
TQCheckListItem::CheckBox);
item->setText(1, TQString("%1 ").tqarg((*it)->indexSize() / 1024) + i18n("KiB"));
item->setText(1, TQString("%1 ").arg((*it)->indexSize() / 1024) + i18n("KiB"));
}
else {
item = new TQCheckListItem(m_modsWithoutIndices, (*it)->name(),

@ -50,7 +50,7 @@ void CModuleIndexDialog::indexAllModules( const ListCSwordModuleInfo& modules )
(*it)->connectIndexingFinished(this, TQT_SLOT(slotFinished()));
(*it)->connectIndexingProgress(this, TQT_SLOT(slotModuleProgress(int)));
progress->setLabel(i18n("Creating index for work %1").tqarg((*it)->name()));
progress->setLabel(i18n("Creating index for work %1").arg((*it)->name()));
qDebug("Building index for work %s", (*it)->name().latin1());
(*it)->buildIndex();

@ -922,36 +922,36 @@ void COptionsDialog::updateStylePreview() {
tree.append( new CTextRendering::KeyTreeItem(
TQString("\n<span class=\"entryname\"><a name=\"John316\" href=\"sword://Bible/WEB/John 3:16\">16</a></span>%1")
.tqarg(i18n("For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.")),
.arg(i18n("For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.")),
settings));
tree.append( new CTextRendering::KeyTreeItem(
TQString("\n<span class=\"entryname\"><a name=\"John317\" href=\"sword://Bible/WEB/John 3:17\">17</a></span>%1")
.tqarg(i18n("For God didn't send his Son into the world to judge the world, but that the world should be saved through him.")),
.arg(i18n("For God didn't send his Son into the world to judge the world, but that the world should be saved through him.")),
settings));
settings.highlight = true;
tree.append( new CTextRendering::KeyTreeItem(
TQString("\n<span class=\"entryname\"><a name=\"John318\" href=\"sword://Bible/WEB/John 3:18\">18</a></span>%1")
.tqarg(i18n("He who believes in him is not judged. He who doesn't believe has been judged already, because he has not believed in the name of the one and only Son of God.")),
.arg(i18n("He who believes in him is not judged. He who doesn't believe has been judged already, because he has not believed in the name of the one and only Son of God.")),
settings) );
settings.highlight = false;
tree.append( new CTextRendering::KeyTreeItem(
TQString("\n<span class=\"entryname\"><a name=\"John319\" href=\"sword://Bible/WEB/John 3:19\">19</a></span>%1")
.tqarg(i18n("This is the judgment, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.")),
.arg(i18n("This is the judgment, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.")),
settings));
tree.append( new CTextRendering::KeyTreeItem(
TQString("\n<span class=\"entryname\"><a name=\"John320\" href=\"sword://Bible/WEB/John 3:20\">20</a></span>%1<br/>")
.tqarg(i18n("For everyone who does evil hates the light, and doesn't come to the light, lest his works would be exposed.")),
.arg(i18n("For everyone who does evil hates the light, and doesn't come to the light, lest his works would be exposed.")),
settings));
tree.append( new CTextRendering::KeyTreeItem(
TQString("\n<span class=\"entryname\"><a name=\"John321\" href=\"sword://Bible/WEB/John 3:21\">21</a></span>%1")
.tqarg(i18n("But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.")),
.arg(i18n("But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.")),
settings));
const TQString oldStyleName = CBTConfig::get

@ -89,7 +89,7 @@ namespace Printing {
Q_ASSERT(printItem);
if (printItem && printItem->hasAlternativeContent()) {
TQString ret = TQString::fromLatin1("<div class=\"entry\"><div class=\"rangeheading\">%1</div>").tqarg(printItem->getAlternativeContent());
TQString ret = TQString::fromLatin1("<div class=\"entry\"><div class=\"rangeheading\">%1</div>").arg(printItem->getAlternativeContent());
if (i.hasChildItems()) {
KeyTree const * tree = i.childList();

@ -30,7 +30,7 @@ CProfile::CProfile( const TQString& file, const TQString& name ):
m_name(name.isEmpty() ? i18n("unknown") : name),
m_filename(file),
m_fullscreen(false),
m_tqgeometry(10,20,640,480) {
m_geometry(10,20,640,480) {
m_profileWindows.setAutoDelete(true);
if (!m_filename.isEmpty() && name.isEmpty()) {
@ -216,14 +216,14 @@ const bool CProfile::save(TQPtrList<CProfileWindow> windows) {
TQDomElement mainWindow = doc.createElement("MAINWINDOW");
mainWindow.setAttribute("fullscreen", fullscreen());
TQDomElement tqgeometry = doc.createElement("GEOMETRY");
mainWindow.appendChild(tqgeometry);
const TQRect r = this->tqgeometry();
tqgeometry.setAttribute("x",r.x());
tqgeometry.setAttribute("y",r.y());
tqgeometry.setAttribute("width",r.width());
tqgeometry.setAttribute("height",r.height());
tqgeometry.setAttribute("isMaximized",static_cast<int>(this->maximized()));
TQDomElement geometry = doc.createElement("GEOMETRY");
mainWindow.appendChild(geometry);
const TQRect r = this->geometry();
geometry.setAttribute("x",r.x());
geometry.setAttribute("y",r.y());
geometry.setAttribute("width",r.width());
geometry.setAttribute("height",r.height());
geometry.setAttribute("isMaximized",static_cast<int>(this->maximized()));
content.appendChild(mainWindow);
}
@ -253,14 +253,14 @@ const bool CProfile::save(TQPtrList<CProfileWindow> windows) {
window.setAttribute("hasFocus", p->hasFocus());
//save geomtery
const TQRect r = p->tqgeometry();
TQDomElement tqgeometry = doc.createElement("GEOMETRY");
tqgeometry.setAttribute("x",r.x());
tqgeometry.setAttribute("y",r.y());
tqgeometry.setAttribute("width",r.width());
tqgeometry.setAttribute("height",r.height());
tqgeometry.setAttribute("isMaximized",static_cast<int>(p->maximized()));
window.appendChild( tqgeometry );
const TQRect r = p->geometry();
TQDomElement geometry = doc.createElement("GEOMETRY");
geometry.setAttribute("x",r.x());
geometry.setAttribute("y",r.y());
geometry.setAttribute("width",r.width());
geometry.setAttribute("height",r.height());
geometry.setAttribute("isMaximized",static_cast<int>(p->maximized()));
window.appendChild( geometry );
TQDomElement modules = doc.createElement("MODULES");
modules.setAttribute("separator", "|");
@ -384,14 +384,14 @@ void CProfile::setMaximized( const bool maximized ) {
m_maximized = maximized;
}
/** Returns the tqgeometry of the main window */
const TQRect CProfile::tqgeometry() {
return m_tqgeometry;
/** Returns the geometry of the main window */
const TQRect CProfile::geometry() {
return m_geometry;
}
/** Stes the geoemtry of the main window */
void CProfile::setGeometry( const TQRect rect ) {
m_tqgeometry = rect;
m_geometry = rect;
}
} //end of namespace Profile

@ -78,9 +78,9 @@ public:
*/
void setGeometry( const TQRect rect );
/**
* Returns the tqgeometry of the main window
* Returns the geometry of the main window
*/
const TQRect tqgeometry();
const TQRect geometry();
private:
/**
@ -94,7 +94,7 @@ private:
TQString m_filename;
bool m_fullscreen;
bool m_maximized;
TQRect m_tqgeometry;
TQRect m_geometry;
};
} //end of namespace Profile

@ -29,7 +29,7 @@ m_writeWindowType(0) {
CProfileWindow::~CProfileWindow() {}
/** Returns the size of the window including the x,y coordinates. */
const TQRect& CProfileWindow::tqgeometry() const {
const TQRect& CProfileWindow::geometry() const {
return m_windowGeometry;
}

@ -54,7 +54,7 @@ public:
/**
* Returns the size of the window including the x,y coordinates.
*/
const TQRect& tqgeometry() const;
const TQRect& geometry() const;
/**
* Returns a list of module names which are chosen in the managed window profile.
*/

@ -72,14 +72,14 @@ namespace InfoDisplay {
if (!linkText.isEmpty()) { //if we have a valid link text
// qWarning("rendering");
return TQString("<a href=\"%1\">%2</a>")
.tqarg(
.arg(
CReferenceManager::encodeHyperlink(
module->name(),
item.key(),
CReferenceManager::typeFromModule(module->type())
)
)
.tqarg(linkText);
.arg(linkText);
}
return TQString();

@ -90,7 +90,7 @@ namespace BookshelfManager {
TQString swordConfPath = BTInstallMgr::Tool::LocalConfig::swordConfigFilename();
TQLabel* confPathLabel = new TQLabel(i18n("Your bookshelf configuration file is <b>%1</b>").tqarg(swordConfPath), page);
TQLabel* confPathLabel = new TQLabel(i18n("Your bookshelf configuration file is <b>%1</b>").arg(swordConfPath), page);
tqlayout->addMultiCellWidget(confPathLabel, 1,1,0,3);
m_swordPathListBox = new TQListView(page);
@ -149,7 +149,7 @@ the module remote installation feature!</b>")
);
tqlayout->addMultiCellWidget(installLabel, 0,0,0,2);
TQLabel* sourceHeadingLabel = new TQLabel(TQString("<b>%1</b>").tqarg(i18n("Select library")), m_installSourcePage);
TQLabel* sourceHeadingLabel = new TQLabel(TQString("<b>%1</b>").arg(i18n("Select library")), m_installSourcePage);
tqlayout->addMultiCellWidget(sourceHeadingLabel, 1,1,0,1);
m_sourceCombo = new TQComboBox(m_installSourcePage);
@ -168,7 +168,7 @@ the module remote installation feature!</b>")
m_sourceLabel = new TQLabel(m_installSourcePage);
tqlayout->addMultiCellWidget(m_sourceLabel, 3,3,0,1);
TQLabel* targetHeadingLabel = new TQLabel(TQString("<b>%1</b>").tqarg(i18n("Select bookshelf path")), m_installSourcePage);
TQLabel* targetHeadingLabel = new TQLabel(TQString("<b>%1</b>").arg(i18n("Select bookshelf path")), m_installSourcePage);
tqlayout->addMultiCellWidget(targetHeadingLabel, 4,4,0,1);
m_targetCombo = new TQComboBox(m_installSourcePage);
@ -220,7 +220,7 @@ the module remote installation feature!</b>")
);
tqlayout->addMultiCellWidget(mainLabel, 0, 0, 0, 3);
TQLabel* headingLabel = new TQLabel(TQString("<b>%1</b>").tqarg(i18n("Select works to be uninstalled")), page);
TQLabel* headingLabel = new TQLabel(TQString("<b>%1</b>").arg(i18n("Select works to be uninstalled")), page);
tqlayout->addMultiCellWidget(headingLabel, 1, 1, 0, 3);
m_removeModuleListView = new CSwordSetupModuleListView(page, false);
@ -379,10 +379,10 @@ the module remote installation feature!</b>")
sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&mgr, source) ;
if (BTInstallMgr::Tool::RemoteConfig::isRemoteSource(&is)) {
url = TQString("ftp://%1%2").tqarg(is.source.c_str()).tqarg(is.directory.c_str());
url = TQString("ftp://%1%2").arg(is.source.c_str()).arg(is.directory.c_str());
}
else {
url = TQString("%1").tqarg(is.directory.c_str());
url = TQString("%1").arg(is.directory.c_str());
}
m_sourceLabel->setText( url );
@ -405,7 +405,7 @@ the module remote installation feature!</b>")
}
const TQString message = i18n("You selected the following work(s): %1.\n\n"
"Do you really want to remove them from your system?").tqarg(moduleList.join(", "));
"Do you really want to remove them from your system?").arg(moduleList.join(", "));
if ((KMessageBox::warningYesNo(0, message, i18n("Warning")) == KMessageBox::Yes)) { //Yes was pressed.
sword::InstallMgr installMgr;
@ -696,7 +696,7 @@ the module remote installation feature!</b>")
}
const TQString message = i18n("You selected the following works: %1.\n\n\
Do you really want to install them on your system?").tqarg(moduleList.join(", "));
Do you really want to install them on your system?").arg(moduleList.join(", "));
if ((KMessageBox::warningYesNo(0, message, i18n("Warning")) == KMessageBox::Yes)) { //Yes was pressed.
BTInstallMgr iMgr;
@ -795,7 +795,7 @@ the module remote installation feature!</b>")
void CSwordSetupDialog::installCompleted( const int total, const int /* file */) {
if (m_progressDialog) {
m_progressDialog->progressBar()->setProgress(total+100*m_installedModuleCount);
m_progressDialog->setLabel( i18n("[%1]: %2% complete").tqarg(m_installingModule).tqarg(total) );
m_progressDialog->setLabel( i18n("[%1]: %2% complete").arg(m_installingModule).arg(total) );
}
KApplication::kApplication()->processEvents();
}

@ -168,9 +168,9 @@ const TQString CHTMLReadDisplay::text( const CDisplay::TextType format, const CD
.append(key->module()->name())
.append(")");
/* ("%1\n(%2, %3)")
.tqarg()
.tqarg(key->key())
.tqarg(key->module()->name());*/
.arg()
.arg(key->key())
.arg(key->module()->name());*/
}
return TQString();
}

@ -78,7 +78,7 @@ void CHTMLWriteDisplay::alignRight() {
};
/** The text's tqalignment changed. Enable the right buttons. */
/** The text's alignment changed. Enable the right buttons. */
void CHTMLWriteDisplay::slotAlignmentChanged( int a ) {
bool alignLeft = false;
bool alignCenter = false;
@ -99,7 +99,7 @@ void CHTMLWriteDisplay::slotAlignmentChanged( int a ) {
// }
else {
alignLeft = true;
qWarning("unknown tqalignment %i", a);
qWarning("unknown alignment %i", a);
}
m_actions.alignLeft->setChecked( alignLeft );
@ -195,7 +195,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
m_actions.underline->plug(bar);
(new KActionSeparator())->plug(bar); //seperate formatting from tqalignment buttons
(new KActionSeparator())->plug(bar); //seperate formatting from alignment buttons
m_actions.alignLeft = new KToggleAction( i18n("Left"),
CResMgr::displaywindows::writeWindow::alignLeft::icon,
@ -248,7 +248,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
//set initial values for toolbar items
slotFontChanged( font() );
slotAlignmentChanged( tqalignment() );
slotAlignmentChanged( alignment() );
slotColorChanged( color() );
}

@ -70,7 +70,7 @@ protected slots:
void slotFontChanged( const TQFont& );
/**
* The text's tqalignment changed. Enable the right buttons.
* The text's alignment changed. Enable the right buttons.
*/
void slotAlignmentChanged( int );
/**

@ -138,7 +138,7 @@ void CPlainWriteDisplay::contentsDropEvent( TQDropEvent* e ) {
TQString moduleText = key->strippedText();
const TQString text = TQString::fromLatin1("%1\n(%2, %3)\n").tqarg(moduleText).tqarg((*it).bookmarkKey()).tqarg((*it).bookmarkModule());
const TQString text = TQString::fromLatin1("%1\n(%2, %3)\n").arg(moduleText).arg((*it).bookmarkKey()).arg((*it).bookmarkModule());
placeCursor( e->pos() );
insert( text );

@ -135,8 +135,8 @@ void CPlainWriteWindow::saveCurrentText( const TQString& /*key*/ ) {
} else {
KMessageBox::error( this,
TQString::fromLatin1("<qt><B>%1</B><BR>%2</qt>")
.tqarg( i18n("Module is not writable.") )
.tqarg( i18n("Either the module may not be edited, or "
.arg( i18n("Module is not writable.") )
.arg( i18n("Either the module may not be edited, or "
"you do not have write permission.") ),
i18n("Module not writable") );
}

@ -157,7 +157,7 @@ void CReadWindow::applyProfileSettings(CProfileWindow * const settings) {
parentWidget()->showMaximized();
}
else {
const TQRect rect = settings->tqgeometry();
const TQRect rect = settings->geometry();
resize(rect.width(), rect.height());
parentWidget()->move(rect.x(), rect.y());
}

@ -95,10 +95,10 @@ void CWriteWindow::applyProfileSettings(CProfileWindow * const settings) {
parentWidget()->showMaximized();
}
else {
const TQRect rect = settings->tqgeometry();
const TQRect rect = settings->geometry();
resize(rect.width(), rect.height());
parentWidget()->move(rect.x(), rect.y());
//setGeometry( settings->tqgeometry() );
//setGeometry( settings->geometry() );
}
// displayWidget()->view()->horizontalScrollBar()->setValue( settings->scrollbarPositions().horizontal );
// m_htmlWidget->view()->verticalScrollBar()->setValue( settings->scrollbarPositions().vertical );

@ -94,7 +94,7 @@ KStartupLogo::KStartupLogo()
void KStartupLogo::setText(const TQString text) {
//Please not make the text bold & let the first character be blank
textLabel->setText( TQString::fromLatin1(" %1").tqarg(text) );
textLabel->setText( TQString::fromLatin1(" %1").arg(text) );
KApplication::kApplication()->processEvents();
}

@ -285,8 +285,8 @@ void CBookmarkItem::update() {
setPixmap(0,SmallIcon(CResMgr::mainIndex::bookmark::icon,16));
const TQString title = TQString::fromLatin1("%1 (%2)")
.tqarg(key())
.tqarg(module() ? module()->name() : i18n("unknown"));
.arg(key())
.arg(module() ? module()->name() : i18n("unknown"));
setText(0, title);
}
@ -326,18 +326,18 @@ const TQString CBookmarkItem::toolTip() {
if (fontPair.first) { //use a special font
qWarning("using a font, %s", TQString(fontPair.second.family()).latin1());
ret = TQString::fromLatin1("<b>%1 (%2)</b><br/><small>%3</small><hr><font face=\"%4\" size=\"4\">%5</font>")
.tqarg(key())
.tqarg(module()->name())
.tqarg(description())
.tqarg(fontPair.second.family())
.tqarg(k->renderedText());
.arg(key())
.arg(module()->name())
.arg(description())
.arg(fontPair.second.family())
.arg(k->renderedText());
}
else {
ret = TQString::fromLatin1("<b>%1 (%2)</b><br/><small>%3</small><hr>%4")
.tqarg(key())
.tqarg(module()->name())
.tqarg(description())
.tqarg(k->renderedText());
.arg(key())
.arg(module()->name())
.arg(description())
.arg(k->renderedText());
}
return ret;

@ -381,7 +381,7 @@ int CSearchAnalysisItem::width() {
/** Returns the tooltip for this item. */
const TQString CSearchAnalysisItem::getToolTip() {
TQString ret = TQString("<center><b>%1</b></center><hr/>").tqarg(m_bookName);
TQString ret = TQString("<center><b>%1</b></center><hr/>").arg(m_bookName);
ret += "<table cellspacing=\"0\" cellpadding=\"3\" width=\"100%\" height=\"100%\" align=\"center\">";
//ToDo: Fix that loop
@ -395,10 +395,10 @@ const TQString CSearchAnalysisItem::getToolTip() {
ret.append(
TQString("<tr bgcolor=\"white\"><td><b><font color=\"#%1\">%2</font></b></td><td>%3 (%4%)</td></tr>")
.tqarg(TQString().sprintf("%02X%02X%02X",c.red(),c.green(),c.blue()))
.tqarg(info ? info->name() : TQString())
.tqarg( m_resultCountArray[i] )
.tqarg( (info && m_resultCountArray[i])? ((double)m_resultCountArray[i] / (double)info->searchResult().Count())*(double)100 : 0.0, 0, 'g', 2)
.arg(TQString().sprintf("%02X%02X%02X",c.red(),c.green(),c.blue()))
.arg(info ? info->name() : TQString())
.arg( m_resultCountArray[i] )
.arg( (info && m_resultCountArray[i])? ((double)m_resultCountArray[i] / (double)info->searchResult().Count())*(double)100 : 0.0, 0, 'g', 2)
);
++i;
}
@ -514,7 +514,7 @@ void CSearchAnalysisLegendItem::draw (TQPainter& painter) {
/** No descriptions */
void CSearchAnalysis::saveAsHTML() {
const TQString file = KFileDialog::getSaveFileName(TQString(),
TQString("*.html | %1").tqarg(i18n("HTML files")),
TQString("*.html | %1").arg(i18n("HTML files")),
0,
i18n("Save Search Analysis"));
if (file.isNull()) {

@ -180,7 +180,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
</property>
</widget>

@ -75,8 +75,8 @@ bool CToolClass::savePlainFile( const TQString& filename, const TQString& text,
if (saveFile.exists()) {
if (!forceOverwrite && KMessageBox::warningYesNo(0,
TQString::fromLatin1("<qt><B>%1</B><BR>%2</qt>")
.tqarg( i18n("The file already exists.") )
.tqarg( i18n("Do you want to overwrite it?")
.arg( i18n("The file already exists.") )
.arg( i18n("Do you want to overwrite it?")
)
) == KMessageBox::No
) {
@ -96,8 +96,8 @@ bool CToolClass::savePlainFile( const TQString& filename, const TQString& text,
}
else {
KMessageBox::error(0, TQString::fromLatin1("<qt>%1<BR><B>%2</B></qt>")
.tqarg( i18n("The file couldn't be saved.") )
.tqarg( i18n("Please check permissions etc.")));
.arg( i18n("The file couldn't be saved.") )
.arg( i18n("Please check permissions etc.")));
saveFile.close();
ret = false;
}
@ -160,7 +160,7 @@ TQPixmap CToolClass::getIconForModule( CSwordModuleInfo* module_info ) {
}
TQLabel* CToolClass::explanationLabel(TQWidget* parent, const TQString& heading, const TQString& text ) {
TQLabel* label = new TQLabel( TQString::fromLatin1("<B>%1</B><BR>%2").tqarg(heading).tqarg(text),parent );
TQLabel* label = new TQLabel( TQString::fromLatin1("<B>%1</B><BR>%2").arg(heading).arg(text),parent );
label->setAutoResize(true);
label->setMargin(1);
label->setFrameStyle(TQFrame::Box | TQFrame::Plain);
@ -197,20 +197,20 @@ TQString CToolClass::moduleToolTip(CSwordModuleInfo* module) {
TQString text;
text = TQString("<b>%1</b> ").tqarg( module->name() )
+ ((module->category() == CSwordModuleInfo::Cult) ? TQString::fromLatin1("<small><b>%1</b></small><br>").tqarg(i18n("Take care, this work contains cult / questionable material!")) : TQString());
text = TQString("<b>%1</b> ").arg( module->name() )
+ ((module->category() == CSwordModuleInfo::Cult) ? TQString::fromLatin1("<small><b>%1</b></small><br>").arg(i18n("Take care, this work contains cult / questionable material!")) : TQString());
text += TQString("<small>(") + module->config(CSwordModuleInfo::Description) + TQString(")</small><hr>");
text += i18n("Language") + TQString(": %1<br>").tqarg( module->language()->translatedName() );
text += i18n("Language") + TQString(": %1<br>").arg( module->language()->translatedName() );
if (module->isEncrypted()) {
text += i18n("Unlock key") + TQString(": %1<br>")
.tqarg(!module->config(CSwordModuleInfo::CipherKey).isEmpty() ? module->config(CSwordModuleInfo::CipherKey) : TQString("<font COLOR=\"red\">%1</font>").tqarg(i18n("not set")));
.arg(!module->config(CSwordModuleInfo::CipherKey).isEmpty() ? module->config(CSwordModuleInfo::CipherKey) : TQString("<font COLOR=\"red\">%1</font>").arg(i18n("not set")));
}
if (module->hasVersion()) {
text += i18n("Version") + TQString(": %1<br>").tqarg( module->config(CSwordModuleInfo::ModuleVersion) );
text += i18n("Version") + TQString(": %1<br>").arg( module->config(CSwordModuleInfo::ModuleVersion) );
}
TQString options;

Loading…
Cancel
Save