From f78838f2f736acc2b235d8b680f3379a07a6d372 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:59:34 -0600 Subject: Remove additional unneeded tq method conversions --- kbabel/kbabeldict/dictionarymenu.cpp | 4 ++-- kbabel/kbabeldict/kbabeldictbox.cpp | 10 +++++----- kbabel/kbabeldict/kbabelsplash.cpp | 2 +- kbabel/kbabeldict/modules/dbsearchengine/database.cpp | 12 ++++++------ kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp | 4 ++-- kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui | 2 +- .../kbabeldict/modules/dbsearchengine/preferenceswidget.cpp | 4 ++-- kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp | 2 +- kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui | 2 +- kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp | 4 ++-- kbabel/kbabeldict/modules/poauxiliary/pwidget.ui | 2 +- kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp | 2 +- kbabel/kbabeldict/modules/pocompendium/pwidget.ui | 2 +- kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp | 2 +- 14 files changed, 27 insertions(+), 27 deletions(-) (limited to 'kbabel/kbabeldict') diff --git a/kbabel/kbabeldict/dictionarymenu.cpp b/kbabel/kbabeldict/dictionarymenu.cpp index d850f9a6..759468c9 100644 --- a/kbabel/kbabeldict/dictionarymenu.cpp +++ b/kbabel/kbabeldict/dictionarymenu.cpp @@ -112,11 +112,11 @@ void DictionaryMenu::add(const TQString& n, const TQString& moduleId TQString keyString=key; if(keyString.contains("%1")) { - keyString=key.tqarg(accel2id.count()+1); + keyString=key.arg(accel2id.count()+1); } KShortcut k(keyString); - KAction* dictionaryAction = new KAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.tqarg(moduleId).utf8() ); + KAction* dictionaryAction = new KAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.arg(moduleId).utf8() ); uint id = maxId++; dictionaryAction->plug(popup,id); diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp index 62f68f7d..3ccfca44 100644 --- a/kbabel/kbabeldict/kbabeldictbox.cpp +++ b/kbabel/kbabeldict/kbabeldictbox.cpp @@ -1007,7 +1007,7 @@ void KBabelDictBox::showResult(TQListViewItem *item) if(!info->filePath.isEmpty()) { rmbPopup->changeItem(editFileIndex - ,i18n("Edit File %1").tqarg(info->location)); + ,i18n("Edit File %1").arg(info->location)); rmbPopup->setItemEnabled(editFileIndex,true); } else @@ -1182,7 +1182,7 @@ void KBabelDictBox::nextInfo() if(!info->filePath.isEmpty()) { rmbPopup->changeItem(editFileIndex - ,i18n("Edit File %1").tqarg(info->location)); + ,i18n("Edit File %1").arg(info->location)); rmbPopup->setItemEnabled(editFileIndex,true); } else @@ -1255,7 +1255,7 @@ void KBabelDictBox::about() if(aboutData->bugAddress() != "submit@bugs.kde.org") { text += "\n" + i18n("Send bugs to %1") - .tqarg(aboutData->bugAddress()) +"\n"; + .arg(aboutData->bugAddress()) +"\n"; } TQLabel *label = new TQLabel(text,0); @@ -1502,7 +1502,7 @@ void KBabelDictBox::configure(const TQString& id, bool modal) { if(e->id() == id) { - TQString caption = i18n("Configure Dictionary %1").tqarg(e->name()); + TQString caption = i18n("Configure Dictionary %1").arg(e->name()); KDialogBase *dialog = new KDialogBase(this,"prefDialog" , modal, caption , KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel| @@ -1696,7 +1696,7 @@ void KBabelDictBox::editFile() { KMessageBox::sorry(this ,i18n("There was an error starting KBabel:\n%1") - .tqarg(error)); + .arg(error)); return; } } diff --git a/kbabel/kbabeldict/kbabelsplash.cpp b/kbabel/kbabeldict/kbabelsplash.cpp index 85ec22d4..56c5e3a8 100644 --- a/kbabel/kbabeldict/kbabelsplash.cpp +++ b/kbabel/kbabeldict/kbabelsplash.cpp @@ -53,7 +53,7 @@ KBabelSplash::KBabelSplash( TQWidget* parent, const char* name ) picLabel->setFrameStyle(TQFrame::WinPanel | TQFrame::Raised); - // Set tqgeometry, with support for Xinerama systems + // Set geometry, with support for Xinerama systems TQRect r; r.setSize(sizeHint()); int ps = TQApplication::desktop()->primaryScreen(); diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp index 95ec19dd..699e3530 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp @@ -703,7 +703,7 @@ DataBaseManager::cursorGet (uint32 flags) else { kdDebug (KBABEL_SEARCH) << TQString ("...cursor getting...%1"). - tqarg (ret) << endl; + arg (ret) << endl; return DataBaseItem (); } @@ -782,7 +782,7 @@ DataBaseManager::createDataBase (TQString directory, rename (filename.local8Bit (), filename.local8Bit () + ",old"); -//kdDebug(0) << TQString("Creating %1").tqarg(filename) << endl; +//kdDebug(0) << TQString("Creating %1").arg(filename) << endl; iAmOk = true; @@ -861,7 +861,7 @@ DataBaseManager::createDataBase (TQString directory, loadInfo (); else kdDebug (KBABEL_SEARCH) << TQString ("I am NOT ok : %1"). - tqarg (ret) << endl; + arg (ret) << endl; //THIS IS WRONG, rewrite the error handling. return iAmOk; @@ -889,7 +889,7 @@ DataBaseManager::getCatalogInfo (int n) return InfoItem (); } -// kdDebug(0) << TQString("Trad %1").tqarg(ret) << endl; +// kdDebug(0) << TQString("Trad %1").arg(ret) << endl; InfoItem it ((char *) data.data, language); //free(data.data); // Read docu for this!!!! @@ -1324,7 +1324,7 @@ DataBaseManager::appendKey (TQString _key) else ret = *(uint32 *) key.data; -//kdDebug(0) << TQString("Append result %1,err = %1").tqarg(ret).tqarg(err) << endl; +//kdDebug(0) << TQString("Append result %1,err = %1").arg(ret).arg(err) << endl; free (data.data); @@ -1353,7 +1353,7 @@ DataBaseManager::getKey (uint32 n) return TQString::fromUtf8 ((char *) data.data); -// kdDebug(0) << TQString("Trad %1").tqarg(ret) << endl; +// kdDebug(0) << TQString("Trad %1").arg(ret) << endl; } diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp index 10a3a796..47bc8fa9 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp @@ -57,7 +57,7 @@ if (!called) { pb=true; count=0;} called=true; -kdDebug(0) << TQString("cat: %1, %2").tqarg(pathName).tqarg(pattern) << endl; +kdDebug(0) << TQString("cat: %1, %2").arg(pathName).arg(pattern) << endl; if(pb) {emit patternStarted(); @@ -149,7 +149,7 @@ tot=catalog->numberOfEntries(); bool fuzzy; bool untra; -//kdDebug(0) << TQString("Tot: %1").tqarg(tot) << endl; +//kdDebug(0) << TQString("Tot: %1").arg(tot) << endl; for (i=0;i [A-Za-z0-9_% - + AlignVCenter|AlignRight diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp index a3481a07..4effd2cc 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp @@ -99,12 +99,12 @@ TQString defaultDir; void PreferencesWidget::setName(TQString n) { -dbpw->filenameLB->setText(i18n("Scanning file: %1").tqarg(n)); +dbpw->filenameLB->setText(i18n("Scanning file: %1").arg(n)); } void PreferencesWidget::setEntries(int i) { -dbpw->entriesLB->setText(i18n("Entries added: %1").tqarg(i)); +dbpw->entriesLB->setText(i18n("Entries added: %1").arg(i)); } diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp index c4f5e397..923d9897 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp @@ -138,7 +138,7 @@ if (!called) { pb=true; count=0;} called=true; -kdDebug(0) << TQString("Scanning: %1, %2").tqarg(pathName).tqarg(pattern) << endl; +kdDebug(0) << TQString("Scanning: %1, %2").arg(pathName).arg(pattern) << endl; if(pb) { diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui index 0834f06c..e3ef3776 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui @@ -490,7 +490,7 @@ If you search for <em>My name is Andrea</em> and you have activated [A-Za-z0-9_% - + AlignVCenter|AlignRight diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp index 589b3d25..110dd874 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp @@ -393,7 +393,7 @@ void PoAuxiliary::loadAuxiliary() { TQString dir=directory(editedFile,number); TQString s("@DIR%1@"); - path.replace(s.tqarg(number),dir); + path.replace(s.arg(number),dir); pos+=dir.length(); } @@ -436,7 +436,7 @@ void PoAuxiliary::loadAuxiliary() { error = true; errorMsg = i18n("Error while trying to open file for PO Auxiliary module:\n%1") - .tqarg(u.prettyURL()); + .arg(u.prettyURL()); emit hasError(errorMsg); } } diff --git a/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui b/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui index 27179462..f345eebb 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui +++ b/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui @@ -7,7 +7,7 @@ PWidget - tqgeometry + geometry 0 0 diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp index b90479e1..d346bcf5 100644 --- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp @@ -91,7 +91,7 @@ bool CompendiumData::load(KURL url) _error = true; _errorMsg = i18n("Error while trying to read file for PO Compendium module:\n%1") - .tqarg(url.prettyURL()); + .arg(url.prettyURL()); emit progressEnds(); diff --git a/kbabel/kbabeldict/modules/pocompendium/pwidget.ui b/kbabel/kbabeldict/modules/pocompendium/pwidget.ui index 05bafd89..db8de91e 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pwidget.ui +++ b/kbabel/kbabeldict/modules/pocompendium/pwidget.ui @@ -8,7 +8,7 @@ PWidget - tqgeometry + geometry 0 0 diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp index 3c12be11..0c186b57 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp @@ -117,7 +117,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language) _errorMsg = i18n("Error while trying to read file for TMX Compendium module:\n" "%1\n" "Reason: %2") - .tqarg(url.prettyURL()).tqarg(_errorMsg); + .arg(url.prettyURL()).arg(_errorMsg); kdDebug(KBABEL_SEARCH) << "Error: " << _errorMsg << endl; -- cgit v1.2.1