diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:58:08 -0600 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 15:53:30 +0200 |
commit | e7bee19a9f42cffe3a0792348a60e5bee1d3da71 (patch) | |
tree | 92dabc7114bd352b2e4ebb5f64cd3d6429e162f7 /knewsticker | |
parent | 4b54ad17739d1075235f2960ecde230a58b5621c (diff) | |
download | tdenetwork-e7bee19a9f42cffe3a0792348a60e5bee1d3da71.tar.gz tdenetwork-e7bee19a9f42cffe3a0792348a60e5bee1d3da71.zip |
Remove additional unneeded tq method conversions
(cherry picked from commit 1de96857f5b0ed5d4a36e9486ffc8c7f8c802f98)
Diffstat (limited to 'knewsticker')
-rw-r--r-- | knewsticker/common/configaccess.cpp | 6 | ||||
-rw-r--r-- | knewsticker/common/newsengine.cpp | 6 | ||||
-rw-r--r-- | knewsticker/common/newsiconmgr.cpp | 4 | ||||
-rw-r--r-- | knewsticker/knewsticker.cpp | 4 | ||||
-rw-r--r-- | knewsticker/knewstickerconfig.cpp | 6 | ||||
-rw-r--r-- | knewsticker/knewstickerstub/knewstickerstub.cpp | 4 | ||||
-rw-r--r-- | knewsticker/newsscroller.cpp | 6 |
7 files changed, 18 insertions, 18 deletions
diff --git a/knewsticker/common/configaccess.cpp b/knewsticker/common/configaccess.cpp index 6b90e05a..aba34266 100644 --- a/knewsticker/common/configaccess.cpp +++ b/knewsticker/common/configaccess.cpp @@ -611,8 +611,8 @@ ArticleFilter ConfigAccess::filter(const unsigned int filterNo) const ArticleFilter f; f.setId(filterNo); - if (m_cfg->hasGroup(TQString::fromLatin1("Filter #%1").tqarg(filterNo))) { - m_cfg->setGroup(TQString::fromLatin1("Filter #%1").tqarg(filterNo)); + if (m_cfg->hasGroup(TQString::fromLatin1("Filter #%1").arg(filterNo))) { + m_cfg->setGroup(TQString::fromLatin1("Filter #%1").arg(filterNo)); f.setAction(m_cfg->readEntry("Action", i18n("Show"))); f.setNewsSource(m_cfg->readEntry("News source", i18n("all news sources"))); f.setCondition(m_cfg->readEntry("Condition", i18n("contain"))); @@ -640,7 +640,7 @@ void ConfigAccess::setNewsSource(const NewsSourceBase::Data &ns) void ConfigAccess::setFilter(const ArticleFilter &f) { - m_cfg->setGroup(TQString::fromLatin1("Filter #%1").tqarg(f.id())); + m_cfg->setGroup(TQString::fromLatin1("Filter #%1").arg(f.id())); m_cfg->writeEntry("Action", f.action()); m_cfg->writeEntry("News source", f.newsSource()); m_cfg->writeEntry("Condition", f.condition()); diff --git a/knewsticker/common/newsengine.cpp b/knewsticker/common/newsengine.cpp index 3ebb4f19..911095d9 100644 --- a/knewsticker/common/newsengine.cpp +++ b/knewsticker/common/newsengine.cpp @@ -222,7 +222,7 @@ void ProgramNewsSource::slotProgramExited(KProcess *proc) } else { ErrorCode error = static_cast<ErrorCode>(proc->exitStatus()); if (error != NOERR) { - errorMsg = errorMessage(error).tqarg(m_data.sourceFile); + errorMsg = errorMessage(error).arg(m_data.sourceFile); okSoFar = false; } } @@ -231,10 +231,10 @@ void ProgramNewsSource::slotProgramExited(KProcess *proc) TQString output = TQString(m_programOutput->buffer()); if (!output.isEmpty()) { output = TQString::fromLatin1("\"") + output + TQString::fromLatin1("\""); - errorMsg += i18n("<p>Program output:<br>%1<br>").tqarg(output); + errorMsg += i18n("<p>Program output:<br>%1<br>").arg(output); } KMessageBox::detailedError(0, i18n("An error occurred while updating the" - " news source '%1'.").tqarg(newsSourceName()), errorMsg, + " news source '%1'.").arg(newsSourceName()), errorMsg, i18n("KNewsTicker Error")); } diff --git a/knewsticker/common/newsiconmgr.cpp b/knewsticker/common/newsiconmgr.cpp index c80ecb60..6e8e88d7 100644 --- a/knewsticker/common/newsiconmgr.cpp +++ b/knewsticker/common/newsiconmgr.cpp @@ -85,7 +85,7 @@ void NewsIconMgr::getIcon(const KURL &url) kapp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", data); } else { emit gotIcon(url, TQPixmap(KGlobal::dirs()->findResource("cache", - TQString::fromLatin1("favicons/%1.png").tqarg(url.host())))); + TQString::fromLatin1("favicons/%1.png").arg(url.host())))); } } else { KIO::Job *job = KIO::get(url, true, false); @@ -133,7 +133,7 @@ void NewsIconMgr::slotGotIcon(bool isHost, TQString hostOrURL, TQString iconName emit gotIcon(url, m_stdIcon); else emit gotIcon(url, TQPixmap(KGlobal::dirs()->findResource("cache", - TQString::fromLatin1("favicons/%1.png").tqarg(url.host())))); + TQString::fromLatin1("favicons/%1.png").arg(url.host())))); } TQString NewsIconMgr::favicon(const KURL &url) const diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp index ff525e3e..535485bf 100644 --- a/knewsticker/knewsticker.cpp +++ b/knewsticker/knewsticker.cpp @@ -288,14 +288,14 @@ void KNewsTicker::slotNotifyOfFailures() if (m_failedNewsUpdates.count() == 1) notification = i18n("<qt>Could not update news site '%1'.<br>" "The supplied resource file is probably invalid or" - " broken.</qt>").tqarg(m_failedNewsUpdates.first()); + " broken.</qt>").arg(m_failedNewsUpdates.first()); else if (m_failedNewsUpdates.count() > 1 && m_failedNewsUpdates.count() < 8) { notification = i18n("<qt>The following news sites had problems. Their" " resource files are probably invalid or broken.<ul>"); TQStringList::ConstIterator it = m_failedNewsUpdates.begin(); TQStringList::ConstIterator end = m_failedNewsUpdates.end(); for (; it != end; ++it) - notification += TQString::fromLatin1("<li>%1</li>").tqarg(*it); + notification += TQString::fromLatin1("<li>%1</li>").arg(*it); notification += TQString::fromLatin1("</ul></qt>"); } else notification = i18n("Failed to update several news" diff --git a/knewsticker/knewstickerconfig.cpp b/knewsticker/knewstickerconfig.cpp index 261ade52..aec193cb 100644 --- a/knewsticker/knewstickerconfig.cpp +++ b/knewsticker/knewstickerconfig.cpp @@ -251,7 +251,7 @@ bool KNewsTickerConfig::eventFilter(TQObject *o, TQEvent *e) } int i = 0; while (validName == false) { - name = i18n("Unknown %1").tqarg(i); + name = i18n("Unknown %1").arg(i); for (TQListViewItemIterator it(m_child->lvNewsSources); it.current(); it++) { if (it.current()->text(0) == name) { i++; @@ -364,9 +364,9 @@ void KNewsTickerConfig::slotNewsSourceContextMenu(KListView *, TQListViewItem *i menu->insertTitle(logoIcon, i18n("Edit News Source")); menu->insertItem(addIcon, i18n("&Add News Source"), 0); if (item) { - menu->insertItem(modifyIcon, i18n("&Modify '%1'").tqarg(item->text(0)), 1); + menu->insertItem(modifyIcon, i18n("&Modify '%1'").arg(item->text(0)), 1); if (m_child->lvNewsSources->selectedItems().count() == 1) { - menu->insertItem(removeIcon, i18n("&Remove '%1'").tqarg(item->text(0)), 2); + menu->insertItem(removeIcon, i18n("&Remove '%1'").arg(item->text(0)), 2); } else { menu->insertItem(removeIcon, i18n("&Remove News Sources"), 2); } diff --git a/knewsticker/knewstickerstub/knewstickerstub.cpp b/knewsticker/knewstickerstub/knewstickerstub.cpp index 2941ed37..ac4ddeeb 100644 --- a/knewsticker/knewstickerstub/knewstickerstub.cpp +++ b/knewsticker/knewstickerstub/knewstickerstub.cpp @@ -59,8 +59,8 @@ int main(int argc, char **argv) TQString name = i18n("Unknown"); if (newsSources.contains(name)) for (unsigned int i = 0; ; i++) - if (!newsSources.contains(i18n("Unknown %1").tqarg(i))) { - name = i18n("Unknown %1").tqarg(i); + if (!newsSources.contains(i18n("Unknown %1").arg(i))) { + name = i18n("Unknown %1").arg(i); break; } diff --git a/knewsticker/newsscroller.cpp b/knewsticker/newsscroller.cpp index 6b1be85f..df824c4a 100644 --- a/knewsticker/newsscroller.cpp +++ b/knewsticker/newsscroller.cpp @@ -184,7 +184,7 @@ void NewsScroller::dropEvent(TQDropEvent* event) newSourceUrl = newSourceUrl.stripWhiteSpace(); if (!isHeadline(newSourceUrl) && KMessageBox::questionYesNo(this, i18n("<p>Do you really want to add '%1' to" " the list of news sources?</p>") - .tqarg(newSourceUrl), TQString(), i18n("Add"), KStdGuiItem::cancel()) == KMessageBox::Yes) { + .arg(newSourceUrl), TQString(), i18n("Add"), KStdGuiItem::cancel()) == KMessageBox::Yes) { KConfig cfg(TQString::fromLatin1("knewsticker_panelappletrc"), false, false); ConfigAccess configFrontend(&cfg); TQStringList newsSources = configFrontend.newsSources(); @@ -192,8 +192,8 @@ void NewsScroller::dropEvent(TQDropEvent* event) TQString name = i18n("Unknown"); if (newsSources.contains(name)) for (unsigned int i = 0; ; i++) - if (!newsSources.contains(i18n("Unknown %1").tqarg(i))) { - name = i18n("Unknown %1").tqarg(i); + if (!newsSources.contains(i18n("Unknown %1").arg(i))) { + name = i18n("Unknown %1").arg(i); break; } |