summaryrefslogtreecommitdiffstats
path: root/knewsticker
diff options
context:
space:
mode:
Diffstat (limited to 'knewsticker')
-rw-r--r--knewsticker/common/configaccess.cpp6
-rw-r--r--knewsticker/knewsticker.cpp10
-rw-r--r--knewsticker/knewstickerconfig.cpp4
-rw-r--r--knewsticker/knewstickerstub/knewstickerstub.cpp4
-rw-r--r--knewsticker/newsscroller.cpp10
5 files changed, 17 insertions, 17 deletions
diff --git a/knewsticker/common/configaccess.cpp b/knewsticker/common/configaccess.cpp
index 40e304fb..5fc86dcc 100644
--- a/knewsticker/common/configaccess.cpp
+++ b/knewsticker/common/configaccess.cpp
@@ -379,9 +379,9 @@ bool ArticleFilter::matches(Article::Ptr a) const
bool matches;
if (condition() == i18n("contain"))
- matches = a->headline().tqcontains(expression());
+ matches = a->headline().contains(expression());
else if (condition() == i18n("do not contain"))
- matches = !a->headline().tqcontains(expression());
+ matches = !a->headline().contains(expression());
else if (condition() == i18n("equal"))
matches = (a->headline() == expression());
else if (condition() == i18n("do not equal"))
@@ -594,7 +594,7 @@ NewsSourceBase *ConfigAccess::newsSource(const TQString &newsSource)
nsd = NewsSourceDefault[i];
if (nsd.enabled)
nsd.enabled = (nsd.language == TQString::tqfromLatin1("C") ||
- KGlobal::locale()->languageList().tqcontains(nsd.language));
+ KGlobal::locale()->languageList().contains(nsd.language));
break;
}
diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp
index 545aba63..a25bc569 100644
--- a/knewsticker/knewsticker.cpp
+++ b/knewsticker/knewsticker.cpp
@@ -429,19 +429,19 @@ void KNewsTickerMenu::populateMenu()
NewsSourceBase::Ptr ns = *nIt;
KPopupMenu *submenu = new KPopupMenu;
- int checkNewsId = submenu->insertItem(lookIcon, i18n("Check News"), TQT_TQOBJECT(this), TQT_SLOT(slotCheckNews(int)), 0, sources.tqfindIndex(ns) + 1000);
- setItemParameter(checkNewsId, sources.tqfindIndex(ns));
+ int checkNewsId = submenu->insertItem(lookIcon, i18n("Check News"), TQT_TQOBJECT(this), TQT_SLOT(slotCheckNews(int)), 0, sources.findIndex(ns) + 1000);
+ setItemParameter(checkNewsId, sources.findIndex(ns));
submenu->insertSeparator();
- if (m_parent->m_pendingNewsUpdates.tqcontains(ns->newsSourceName())) {
+ if (m_parent->m_pendingNewsUpdates.contains(ns->newsSourceName())) {
submenu->insertItem(noArticlesIcon, i18n("Currently Being Updated, No Articles Available"));
} else if (!ns->articles().isEmpty()) {
const Article::List articles = ns->articles();
Article::List::ConstIterator artIt = articles.begin();
for (; artIt != articles.end(); ++artIt) {
Article::Ptr a = *artIt;
- TQString headline = a->headline().tqreplace('&', "&&");
+ TQString headline = a->headline().replace('&', "&&");
int id;
if ( a->read() )
id = submenu->insertItem(oldArticleIcon, headline, this, TQT_SLOT(slotOpenArticle(int)), 0, articleIdx+2000);
@@ -454,7 +454,7 @@ void KNewsTickerMenu::populateMenu()
submenu->insertItem(noArticlesIcon, i18n("No Articles Available"));
}
- insertItem(ns->icon(), ns->newsSourceName().tqreplace('&', "&&"), submenu);
+ insertItem(ns->icon(), ns->newsSourceName().replace('&', "&&"), submenu);
}
if (!m_parent->m_cfg->newsSources().isEmpty())
diff --git a/knewsticker/knewstickerconfig.cpp b/knewsticker/knewstickerconfig.cpp
index 34024edc..b13db0f5 100644
--- a/knewsticker/knewstickerconfig.cpp
+++ b/knewsticker/knewstickerconfig.cpp
@@ -234,7 +234,7 @@ bool KNewsTickerConfig::eventFilter(TQObject *o, TQEvent *e)
if ( TQTextDrag::decode(d, newSourceUrl) ) {
// <HACK>
// This is just for http://www.webreference.com/services/news/
- newSourceUrl = newSourceUrl.tqreplace( TQRegExp("^view-source:http%3A//"), "http://" );
+ newSourceUrl = newSourceUrl.replace( TQRegExp("^view-source:http%3A//"), "http://" );
// </HACK>
newSourceUrl = newSourceUrl.stripWhiteSpace();
@@ -565,7 +565,7 @@ void KNewsTickerConfig::getNewsIcon(NewsSourceItem *item, const KURL &url)
void KNewsTickerConfig::slotGotNewsIcon(const KURL &url, const TQPixmap &pixmap)
{
- if (m_itemIconMap.tqfind(url.url()) == m_itemIconMap.end()) {
+ if (m_itemIconMap.find(url.url()) == m_itemIconMap.end()) {
kdDebug(5005) << "Got unknown icon for URL " << url << endl;
return;
}
diff --git a/knewsticker/knewstickerstub/knewstickerstub.cpp b/knewsticker/knewstickerstub/knewstickerstub.cpp
index d291b12e..e992b118 100644
--- a/knewsticker/knewstickerstub/knewstickerstub.cpp
+++ b/knewsticker/knewstickerstub/knewstickerstub.cpp
@@ -57,9 +57,9 @@ int main(int argc, char **argv)
// TODO: Use the "Suggest" functionality from addnewssourcedlgimpl.cpp here.
TQString name = i18n("Unknown");
- if (newsSources.tqcontains(name))
+ if (newsSources.contains(name))
for (unsigned int i = 0; ; i++)
- if (!newsSources.tqcontains(i18n("Unknown %1").tqarg(i))) {
+ if (!newsSources.contains(i18n("Unknown %1").tqarg(i))) {
name = i18n("Unknown %1").tqarg(i);
break;
}
diff --git a/knewsticker/newsscroller.cpp b/knewsticker/newsscroller.cpp
index 76d81050..b24e87f9 100644
--- a/knewsticker/newsscroller.cpp
+++ b/knewsticker/newsscroller.cpp
@@ -177,7 +177,7 @@ void NewsScroller::dropEvent(TQDropEvent* event)
if ( TQTextDrag::decode(event, newSourceUrl) ) {
// <HACK>
// This is just for http://www.webreference.com/services/news/
- newSourceUrl = newSourceUrl.tqreplace(TQRegExp(
+ newSourceUrl = newSourceUrl.replace(TQRegExp(
TQString::tqfromLatin1("^view-source:http%3A//")),
TQString::tqfromLatin1("http://"));
// </HACK>
@@ -190,9 +190,9 @@ void NewsScroller::dropEvent(TQDropEvent* event)
TQStringList newsSources = configFrontend.newsSources();
TQString name = i18n("Unknown");
- if (newsSources.tqcontains(name))
+ if (newsSources.contains(name))
for (unsigned int i = 0; ; i++)
- if (!newsSources.tqcontains(i18n("Unknown %1").tqarg(i))) {
+ if (!newsSources.contains(i18n("Unknown %1").tqarg(i))) {
name = i18n("Unknown %1").tqarg(i);
break;
}
@@ -256,7 +256,7 @@ void NewsScroller::scroll(int distance, bool interpret_directions)
TQPoint pt = mapFromGlobal(TQCursor::pos());
- if (contentsRect().tqcontains(pt))
+ if (contentsRect().contains(pt))
updateActive(pt);
update();
@@ -548,7 +548,7 @@ bool NewsScroller::updateActive(const TQPoint &pt)
rect.setWidth(width());
}
- if (rect.tqcontains(pt))
+ if (rect.contains(pt))
break;
}
if (*it)