From 634df849851ae2f74314b8bbe42055f512d80a11 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:36:04 -0600 Subject: Remove additional unneeded tq method conversions (cherry picked from commit 5bef00662dd19d74dc2bd1d6a55659d8d7dfd32a) --- katapult/katapult/katapult.cpp | 2 +- katapult/katapult/katapultsettings.cpp | 8 ++++---- katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp | 8 ++++---- katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp | 2 +- katapult/plugins/catalogs/execcatalog/execcatalog.cpp | 2 +- katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp | 2 +- katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) (limited to 'katapult') diff --git a/katapult/katapult/katapult.cpp b/katapult/katapult/katapult.cpp index e86a4c4..8d421d0 100644 --- a/katapult/katapult/katapult.cpp +++ b/katapult/katapult/katapult.cpp @@ -81,7 +81,7 @@ Katapult::Katapult() //show popup (unless we're session restored) if (!settings->hideNotification()) { TQString msg = i18n("Application successfully started !\nPress %1 to use it...") - .tqarg(globalAccel->shortcut("show_katapult").toString()); + .arg(globalAccel->shortcut("show_katapult").toString()); KPassivePopup::message(i18n("Katapult Notification"), msg, kapp->miniIcon(), this, 0, settings->notificationTimeout()); } } diff --git a/katapult/katapult/katapultsettings.cpp b/katapult/katapult/katapultsettings.cpp index e0a4dc5..ec20e79 100644 --- a/katapult/katapult/katapultsettings.cpp +++ b/katapult/katapult/katapultsettings.cpp @@ -109,14 +109,14 @@ void KatapultSettings::writeSettings() KatapultCatalog *catalog; while((catalog = it.current()) != 0) { - KConfigGroup group(config, TQString("Catalogs/%1").tqarg(it.currentKey())); + KConfigGroup group(config, TQString("Catalogs/%1").arg(it.currentKey())); catalog->writeSettings(&group); ++it; } if(_display != 0) { - KConfigGroup group(config, TQString("Displays/%1").tqarg(_displayName)); + KConfigGroup group(config, TQString("Displays/%1").arg(_displayName)); _display->writeSettings(&group); } @@ -323,7 +323,7 @@ void KatapultSettings::loadCatalogPlugins() (service, 0, 0, TQStringList(), &errCode); if(catalog != 0) { - KConfigGroup group(kapp->config(), TQString("Catalogs/%1").tqarg(id)); + KConfigGroup group(kapp->config(), TQString("Catalogs/%1").arg(id)); catalog->readSettings(&group); catalog->initialize(); _activeCatalogs.insert(id, catalog); @@ -364,7 +364,7 @@ void KatapultSettings::loadDisplayPlugins() } if(_display != 0) { - KConfigGroup group(kapp->config(), TQString("Displays/%1").tqarg(_displayName)); + KConfigGroup group(kapp->config(), TQString("Displays/%1").arg(_displayName)); _display->readSettings(&group); } } diff --git a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp index 2425469..6ad0892 100644 --- a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp +++ b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp @@ -89,8 +89,8 @@ void AmarokCatalog::queryChanged() queryList = TQStringList::split ( TQString(" "), TQString(queryString).replace(TQChar(':')," ").replace(TQChar('\''), " ").replace(TQChar('\''), "%") ); for(TQStringList::Iterator it = queryList.begin(); it != queryList.end(); ++it) { - sqlQuery.append(TQString(" AND (t.title LIKE '\%%1\%'").tqarg(*it)); - sqlQuery.append(TQString(" OR a.name LIKE '\%%1\%')").tqarg(*it)); + sqlQuery.append(TQString(" AND (t.title LIKE '\%%1\%'").arg(*it)); + sqlQuery.append(TQString(" OR a.name LIKE '\%%1\%')").arg(*it)); } sqlQuery.append(" ORDER BY a.name, t.title, s.percentage DESC"); @@ -163,8 +163,8 @@ void AmarokCatalog::queryChanged() TQStringList clauses; for(TQStringList::Iterator it = queryList.begin(); it != queryList.end(); ++it) { - clauses += TQString(" (t.title LIKE '\%%1\%'").tqarg(*it) + - TQString(" OR a.name LIKE '\%%1\%')").tqarg(*it); + clauses += TQString(" (t.title LIKE '\%%1\%'").arg(*it) + + TQString(" OR a.name LIKE '\%%1\%')").arg(*it); } sqlQuery.append(clauses.join(TQString(" AND "))); sqlQuery.append(" ORDER BY a.name, t.title, s.percentage DESC"); diff --git a/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp b/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp index 3de6f5a..06c71da 100644 --- a/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp +++ b/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp @@ -51,7 +51,7 @@ void ActionOpenDocument::execute(const KatapultItem* item) const { if(strcmp(item->className(), "Document") == 0 || strcmp(item->className(), "Directory") == 0) { const Document *document = (const Document *) item; - qDebug("%s", TQString("Running: %1").tqarg(document->path()).latin1()); + qDebug("%s", TQString("Running: %1").arg(document->path()).latin1()); new KRun(document->path()); } } diff --git a/katapult/plugins/catalogs/execcatalog/execcatalog.cpp b/katapult/plugins/catalogs/execcatalog/execcatalog.cpp index 75642c8..7915065 100644 --- a/katapult/plugins/catalogs/execcatalog/execcatalog.cpp +++ b/katapult/plugins/catalogs/execcatalog/execcatalog.cpp @@ -99,7 +99,7 @@ TQWidget * ExecCatalog::configure() settings->triggerWordLE->setText(_triggerWord); connect(settings->triggerWordLE, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(triggerWordChanged(const TQString&))); - settings->introLabel->setText(i18n("Use with \"%1 exec query\"").tqarg(_triggerWord)); + settings->introLabel->setText(i18n("Use with \"%1 exec query\"").arg(_triggerWord)); return settings; } diff --git a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp index 0c0b7c2..a6493e6 100644 --- a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp +++ b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp @@ -99,7 +99,7 @@ TQWidget * GoogleCatalog::configure() settings->triggerWordLE->setText(_triggerWord); connect(settings->triggerWordLE, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(triggerWordChanged(const TQString&))); - settings->introLabel->setText(i18n("Use with \"%1 search query\"").tqarg(_triggerWord)); + settings->introLabel->setText(i18n("Use with \"%1 search query\"").arg(_triggerWord)); return settings; } diff --git a/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp b/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp index 93e103c..fce2495 100644 --- a/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp +++ b/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp @@ -99,7 +99,7 @@ TQWidget * SpellCatalog::configure() settings->triggerWordLE->setText(_triggerWord); connect(settings->triggerWordLE, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(triggerWordChanged(const TQString&))); - settings->introLabel->setText(i18n("Use with \"%1 myword\"").tqarg(_triggerWord)); + settings->introLabel->setText(i18n("Use with \"%1 myword\"").arg(_triggerWord)); return settings; } -- cgit v1.2.3