From 4c6f8d69e2d1501837affb472c4eb8fec4462240 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- akregator/COPYING | 4 +- akregator/src/actionmanagerimpl.cpp | 4 +- akregator/src/addfeeddialog.cpp | 2 +- akregator/src/akregator_part.cpp | 2 +- akregator/src/akregator_view.cpp | 8 +-- akregator/src/article.cpp | 8 +-- akregator/src/articlefilter.cpp | 2 +- akregator/src/articlelistview.cpp | 6 +- akregator/src/articleviewer.cpp | 6 +- akregator/src/articleviewer.rc | 2 +- akregator/src/feed.cpp | 10 +-- akregator/src/feediconmanager.cpp | 8 +-- akregator/src/feedlist.cpp | 4 +- akregator/src/feedlistview.cpp | 4 +- akregator/src/feedstorage.h | 2 +- akregator/src/feedstoragedummyimpl.cpp | 76 +++++++++++----------- akregator/src/feedstoragedummyimpl.h | 2 +- akregator/src/fetchqueue.cpp | 2 +- akregator/src/folder.cpp | 6 +- akregator/src/frame.cpp | 2 +- akregator/src/librss/tools_p.cpp | 26 ++++---- akregator/src/mk4storage/feedstoragemk4impl.cpp | 10 +-- akregator/src/mk4storage/feedstoragemk4impl.h | 2 +- akregator/src/mk4storage/metakit/CHANGES | 2 +- .../src/mk4storage/metakit/include/mk4str.inl | 6 +- akregator/src/mk4storage/metakit/src/store.cpp | 2 +- akregator/src/mk4storage/storagemk4impl.cpp | 2 +- akregator/src/nodelist.cpp | 6 +- akregator/src/pageviewer.cpp | 2 +- akregator/src/pageviewer.rc | 2 +- akregator/src/plugin.cpp | 4 +- akregator/src/progressmanager.cpp | 2 +- akregator/src/simplenodeselector.cpp | 2 +- akregator/src/speechclient.cpp | 2 +- akregator/src/storagedummyimpl.cpp | 14 ++-- akregator/src/storagefactoryregistry.cpp | 2 +- akregator/src/tabwidget.cpp | 12 ++-- akregator/src/tagnode.cpp | 6 +- akregator/src/tagnode.h | 2 +- akregator/src/tagnodelist.cpp | 2 +- akregator/src/tagset.cpp | 12 ++-- akregator/src/tagset.h | 4 +- akregator/src/treenode.cpp | 4 +- akregator/src/treenode.h | 2 +- akregator/src/utils.cpp | 4 +- akregator/src/viewer.cpp | 4 +- 46 files changed, 149 insertions(+), 149 deletions(-) (limited to 'akregator') diff --git a/akregator/COPYING b/akregator/COPYING index 2ad70b8b..c13faf0d 100644 --- a/akregator/COPYING +++ b/akregator/COPYING @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp index 09a9b3cd..b8c94669 100644 --- a/akregator/src/actionmanagerimpl.cpp +++ b/akregator/src/actionmanagerimpl.cpp @@ -148,7 +148,7 @@ void ActionManagerImpl::slotUpdateTagActions(bool enabled, const TQStringList& t for (TQValueList::ConstIterator it = actions.begin(); it != actions.end(); ++it) { - (*it)->setChecked(tagIds.tqcontains((*it)->tag().id())); + (*it)->setChecked(tagIds.contains((*it)->tag().id())); } } } @@ -197,7 +197,7 @@ void ActionManagerImpl::slotTagAdded(const Tag& tag) if (!Settings::showTaggingGUI()) return; - if (!d->tagActions.tqcontains(tag.id())) + if (!d->tagActions.contains(tag.id())) { d->tagActions[tag.id()] = new TagAction(tag, TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignTag(const Tag&, bool)), d->tagMenu); d->tagMenu->insert(d->tagActions[tag.id()]); diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp index 8c5f4d4b..591e0d61 100644 --- a/akregator/src/addfeeddialog.cpp +++ b/akregator/src/addfeeddialog.cpp @@ -79,7 +79,7 @@ void AddFeedDialog::slotOk( ) if (feedURL.startsWith("feed:")) feedURL = feedURL.right( feedURL.length() - 5 ); - if (feedURL.tqfind(":/") == -1) + if (feedURL.find(":/") == -1) feedURL.prepend("http://"); f->setXmlUrl(feedURL); diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index 1cfd42b1..bd9f77cf 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -522,7 +522,7 @@ bool Part::mergePart(KParts::Part* part) { if (m_mergedPart) { factory()->removeClient(m_mergedPart); - if (childClients()->tqcontainsRef(m_mergedPart)) + if (childClients()->containsRef(m_mergedPart)) removeChildClient(m_mergedPart); } if (part) diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index c110d305..c92e4ec2 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -411,10 +411,10 @@ void View::slotOnShutdown() void View::saveSettings() { const TQValueList spl1 = m_horizontalSplitter->sizes(); - if ( spl1.tqcontains( 0 ) == 0 ) + if ( spl1.contains( 0 ) == 0 ) Settings::setSplitter1Sizes( spl1 ); const TQValueList spl2 = m_articleSplitter->sizes(); - if ( spl2.tqcontains( 0 ) == 0 ) + if ( spl2.contains( 0 ) == 0 ) Settings::setSplitter2Sizes( spl2 ); Settings::setViewMode( m_viewMode ); Settings::writeConfig(); @@ -1329,7 +1329,7 @@ void View::slotArticleDelete() for (TQValueList
::Iterator it = articles.begin(); it != articles.end(); ++it) { Feed* feed = (*it).feed(); - if (!feeds.tqcontains(feed)) + if (!feeds.contains(feed)) feeds.append(feed); feed->setNotificationMode(false); (*it).setDeleted(); @@ -1529,7 +1529,7 @@ void View::updateTagActions() TQStringList atags = (*it).tags(); for (TQStringList::ConstIterator it2 = atags.begin(); it2 != atags.end(); ++it2) { - if (!tags.tqcontains(*it2)) + if (!tags.contains(*it2)) tags += *it2; } } diff --git a/akregator/src/article.cpp b/akregator/src/article.cpp index c0151af3..3b7f321a 100644 --- a/akregator/src/article.cpp +++ b/akregator/src/article.cpp @@ -102,7 +102,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive) d->guid = article.guid(); - if (!d->archive->tqcontains(d->guid)) + if (!d->archive->contains(d->guid)) { d->archive->addEntry(d->guid); @@ -425,7 +425,7 @@ void Article::removeTag(const TQString& tag) bool Article::hasTag(const TQString& tag) const { - return d->archive->tags(d->guid).tqcontains(tag); + return d->archive->tags(d->guid).contains(tag); } TQStringList Article::tags() const @@ -453,7 +453,7 @@ TQString Article::buildTitle(const TQString& description) if (description.stripWhiteSpace().isEmpty()) return ""; - int i = s.tqfind('>',500); /*avoid processing too much */ + int i = s.find('>',500); /*avoid processing too much */ if (i != -1) s = s.left(i+1); TQRegExp rx("(<([^\\s>]*)(?:[^>]*)>)[^<]*", false); @@ -470,7 +470,7 @@ TQString Article::buildTitle(const TQString& description) } else toReplace=rx.cap(1); // strip just tag - s=s.tqreplace(s.tqfind(toReplace),toReplace.length(),replaceWith); // do the deed + s=s.replace(s.find(toReplace),toReplace.length(),replaceWith); // do the deed } if (s.length()> 90) s=s.left(90)+"..."; diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp index e8e36f07..715ede19 100644 --- a/akregator/src/articlefilter.cpp +++ b/akregator/src/articlefilter.cpp @@ -179,7 +179,7 @@ bool Criterion::satisfiedBy( const Article &article ) const switch ( predicateType ) { case Contains: - satisfied = concreteSubject.toString().tqfind( m_object.toString(), 0, false ) != -1; + satisfied = concreteSubject.toString().find( m_object.toString(), 0, false ) != -1; break; case Equals: if (subjectType=="int") diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp index 68e41730..ecf26228 100644 --- a/akregator/src/articlelistview.cpp +++ b/akregator/src/articlelistview.cpp @@ -354,7 +354,7 @@ void ArticleListView::slotArticlesAdded(TreeNode* /*node*/, const TQValueList::ConstIterator it = list.begin(); it != list.end(); ++it) { - if (!d->articleMap.tqcontains(*it)) + if (!d->articleMap.contains(*it)) { if (!(*it).isNull() && !(*it).isDeleted()) { @@ -385,7 +385,7 @@ void ArticleListView::slotArticlesUpdated(TreeNode* /*node*/, const TQValueList< for (TQValueList
::ConstIterator it = list.begin(); it != list.end(); ++it) { - if (!(*it).isNull() && d->articleMap.tqcontains(*it)) + if (!(*it).isNull() && d->articleMap.contains(*it)) { ArticleItem* ali = d->articleMap[*it]; @@ -447,7 +447,7 @@ void ArticleListView::slotArticlesRemoved(TreeNode* /*node*/, const TQValueList< for (TQValueList
::ConstIterator it = list.begin(); it != list.end(); ++it) { - if (d->articleMap.tqcontains(*it)) + if (d->articleMap.contains(*it)) { ArticleItem* ali = d->articleMap[*it]; d->articleMap.remove(*it); diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp index a6ab467d..977abc99 100644 --- a/akregator/src/articleviewer.cpp +++ b/akregator/src/articleviewer.cpp @@ -87,7 +87,7 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor { text += TQString("
"); TQString url=node->xmlUrl(); - TQString file = url.tqreplace("/", "_").tqreplace(":", "_"); + TQString file = url.replace("/", "_").replace(":", "_"); KURL u(m_view->m_imageDir); u.setFileName(file); text += TQString("\n").tqarg(node->htmlUrl()).tqarg(u.url()); @@ -410,7 +410,7 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic text += TQString("
\n").tqarg(directionOf(Utils::stripTags(article.title()))); if (article.link().isValid()) text += ""; - text += article.title().tqreplace("<", "<").tqreplace(">", ">"); // TODO: better leave things escaped in the parser + text += article.title().replace("<", "<").replace(">", ">"); // TODO: better leave things escaped in the parser if (article.link().isValid()) text += ""; text += "
\n"; @@ -505,7 +505,7 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art text += TQString("
\n").tqarg(directionOf(Utils::stripTags(article.title()))); if (link.isValid()) text += ""; - text += article.title().tqreplace("<", "<").tqreplace(">", ">"); // TODO: better leave things escaped in the parser + text += article.title().replace("<", "<").replace(">", ">"); // TODO: better leave things escaped in the parser if (link.isValid()) text += ""; text += "
\n"; diff --git a/akregator/src/articleviewer.rc b/akregator/src/articleviewer.rc index a74bdf5c..5b61457b 100644 --- a/akregator/src/articleviewer.rc +++ b/akregator/src/articleviewer.rc @@ -11,7 +11,7 @@ - + diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp index 8e0c4c90..2188b384 100644 --- a/akregator/src/feed.cpp +++ b/akregator/src/feed.cpp @@ -87,7 +87,7 @@ class Feed::FeedPrivate /** caches guids of tagged articles. key: tag, value: list of guids */ TQMap taggedArticles; - /** list of deleted articles. This tqcontains **/ + /** list of deleted articles. This contains **/ TQValueList
deletedArticles; /** caches guids of deleted articles for notification */ @@ -450,7 +450,7 @@ void Feed::appendArticles(const RSS::Document &doc) for (it = d_articles.begin(); it != en; ++it) { - if ( !d->articles.tqcontains((*it).guid()) ) // article not in list + if ( !d->articles.contains((*it).guid()) ) // article not in list { Article mya(*it, this); mya.offsetPubDate(nudge); @@ -535,7 +535,7 @@ void Feed::appendArticle(const Article& a) { if ( (a.keep() && Settings::doNotExpireImportantArticles()) || ( !usesExpiryByAge() || !isExpired(a) ) ) // if not expired { - if (!d->articles.tqcontains(a.guid())) + if (!d->articles.contains(a.guid())) { d->articles[a.guid()] = a; if (!a.isDeleted() && a.status() != Article::Read) @@ -726,10 +726,10 @@ void Feed::setUnread(int unread) void Feed::setArticleDeleted(Article& a) { - if (!d->deletedArticles.tqcontains(a)) + if (!d->deletedArticles.contains(a)) d->deletedArticles.append(a); - if (!d->removedArticlesNotify.tqcontains(a)) + if (!d->removedArticlesNotify.contains(a)) d->removedArticlesNotify.append(a); articlesModified(); diff --git a/akregator/src/feediconmanager.cpp b/akregator/src/feediconmanager.cpp index adc3fce4..ba75561e 100644 --- a/akregator/src/feediconmanager.cpp +++ b/akregator/src/feediconmanager.cpp @@ -59,7 +59,7 @@ FeedIconManager* FeedIconManager::self() void FeedIconManager::fetchIcon(Feed* feed) { - if (!d->registeredFeeds.tqcontains(feed)) + if (!d->registeredFeeds.contains(feed)) { d->registeredFeeds.append(feed); connect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotFeedDestroyed(TreeNode*))); @@ -133,8 +133,8 @@ void FeedIconManager::slotFeedDestroyed(TreeNode* node) { Feed* feed = dynamic_cast(node); if (feed) - while (d->registeredFeeds.tqcontains(feed)) - d->registeredFeeds.remove(d->registeredFeeds.tqfind(feed)); + while (d->registeredFeeds.contains(feed)) + d->registeredFeeds.remove(d->registeredFeeds.find(feed)); } void FeedIconManager::slotIconChanged(bool /*isHost*/, const TQString& hostOrURL, @@ -147,7 +147,7 @@ void FeedIconManager::slotIconChanged(bool /*isHost*/, const TQString& hostOrURL if (!p.isNull()) // we don't set null pixmaps, as feed checks pixmap.isNull() to find out whether the icon was already loaded or not. It would request the icon another time, resulting an infinite loop (until stack overflow that is { while (( f = d->urlDict.take(hostOrURL) )) - if (d->registeredFeeds.tqcontains(f)) + if (d->registeredFeeds.contains(f)) f->setFavicon(p); } emit signalIconChanged(hostOrURL, iconFile); diff --git a/akregator/src/feedlist.cpp b/akregator/src/feedlist.cpp index 50496d8b..72db0911 100644 --- a/akregator/src/feedlist.cpp +++ b/akregator/src/feedlist.cpp @@ -117,7 +117,7 @@ void FeedList::parseChildNodes(TQDomNode &node, Folder* tqparent) Feed* feed = Feed::fromOPML(e); if (feed) { - if (!d->urlMap[feed->xmlUrl()].tqcontains(feed)) + if (!d->urlMap[feed->xmlUrl()].contains(feed)) d->urlMap[feed->xmlUrl()].append(feed); tqparent->appendChild(feed); } @@ -219,7 +219,7 @@ void FeedList::append(FeedList* list, Folder* tqparent, TreeNode* after) if ( list == this ) return; - if ( !flatList()->tqcontains(tqparent) ) + if ( !flatList()->contains(tqparent) ) tqparent = rootNode(); TQValueList tqchildren = list->rootNode()->tqchildren(); diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp index a891445f..fa33b89d 100644 --- a/akregator/src/feedlistview.cpp +++ b/akregator/src/feedlistview.cpp @@ -457,12 +457,12 @@ TreeNode* NodeListView::findNodeByTitle(const TQString& title) TreeNodeItem* NodeListView::findNodeItem(TreeNode* node) { - return d->itemDict.tqfind(node); + return d->itemDict.find(node); } TreeNodeItem* NodeListView::findItemByTitle(const TQString& text, int column, ComparisonFlags compare) const { - return dynamic_cast (KListView::tqfindItem(text, column, compare)); + return dynamic_cast (KListView::findItem(text, column, compare)); } void NodeListView::ensureNodeVisible(TreeNode* node) diff --git a/akregator/src/feedstorage.h b/akregator/src/feedstorage.h index c0685695..32e6c058 100644 --- a/akregator/src/feedstorage.h +++ b/akregator/src/feedstorage.h @@ -92,7 +92,7 @@ class AKREGATOR_EXPORT FeedStorage : public TQObject virtual void clear() = 0; - virtual bool tqcontains(const TQString& guid) = 0; + virtual bool contains(const TQString& guid) = 0; virtual void addEntry(const TQString& guid) = 0; virtual void deleteArticle(const TQString& guid) = 0; virtual int comments(const TQString& guid) = 0; diff --git a/akregator/src/feedstoragedummyimpl.cpp b/akregator/src/feedstoragedummyimpl.cpp index 9d7b8e12..5ae572a8 100644 --- a/akregator/src/feedstoragedummyimpl.cpp +++ b/akregator/src/feedstoragedummyimpl.cpp @@ -147,21 +147,21 @@ TQStringList FeedStorageDummyImpl::articles(const Category& cat) void FeedStorageDummyImpl::addEntry(const TQString& guid) { - if (!d->entries.tqcontains(guid)) + if (!d->entries.contains(guid)) { d->entries[guid] = FeedStorageDummyImplPrivate::Entry(); setTotalCount(totalCount()+1); } } -bool FeedStorageDummyImpl::tqcontains(const TQString& guid) +bool FeedStorageDummyImpl::contains(const TQString& guid) { - return d->entries.tqcontains(guid); + return d->entries.contains(guid); } void FeedStorageDummyImpl::deleteArticle(const TQString& guid) { - if (!d->entries.tqcontains(guid)) + if (!d->entries.contains(guid)) return; setDeleted(guid); @@ -172,33 +172,33 @@ void FeedStorageDummyImpl::deleteArticle(const TQString& guid) int FeedStorageDummyImpl::comments(const TQString& guid) { - return tqcontains(guid) ? d->entries[guid].comments : 0; + return contains(guid) ? d->entries[guid].comments : 0; } TQString FeedStorageDummyImpl::commentsLink(const TQString& guid) { - return tqcontains(guid) ? d->entries[guid].commentsLink : ""; + return contains(guid) ? d->entries[guid].commentsLink : ""; } bool FeedStorageDummyImpl::guidIsHash(const TQString& guid) { - return tqcontains(guid) ? d->entries[guid].guidIsHash : false; + return contains(guid) ? d->entries[guid].guidIsHash : false; } bool FeedStorageDummyImpl::guidIsPermaLink(const TQString& guid) { - return tqcontains(guid) ? d->entries[guid].guidIsPermaLink : false; + return contains(guid) ? d->entries[guid].guidIsPermaLink : false; } uint FeedStorageDummyImpl::hash(const TQString& guid) { - return tqcontains(guid) ? d->entries[guid].hash : 0; + return contains(guid) ? d->entries[guid].hash : 0; } void FeedStorageDummyImpl::setDeleted(const TQString& guid) { - if (!tqcontains(guid)) + if (!contains(guid)) return; FeedStorageDummyImplPrivate::Entry entry = d->entries[guid]; @@ -233,99 +233,99 @@ void FeedStorageDummyImpl::setDeleted(const TQString& guid) TQString FeedStorageDummyImpl::link(const TQString& guid) { - return tqcontains(guid) ? d->entries[guid].link : ""; + return contains(guid) ? d->entries[guid].link : ""; } uint FeedStorageDummyImpl::pubDate(const TQString& guid) { - return tqcontains(guid) ? d->entries[guid].pubDate : 0; + return contains(guid) ? d->entries[guid].pubDate : 0; } int FeedStorageDummyImpl::status(const TQString& guid) { - return tqcontains(guid) ? d->entries[guid].status : 0; + return contains(guid) ? d->entries[guid].status : 0; } void FeedStorageDummyImpl::setqStatus(const TQString& guid, int status) { - if (tqcontains(guid)) + if (contains(guid)) d->entries[guid].status = status; } TQString FeedStorageDummyImpl::title(const TQString& guid) { - return tqcontains(guid) ? d->entries[guid].title : ""; + return contains(guid) ? d->entries[guid].title : ""; } TQString FeedStorageDummyImpl::description(const TQString& guid) { - return tqcontains(guid) ? d->entries[guid].description : ""; + return contains(guid) ? d->entries[guid].description : ""; } void FeedStorageDummyImpl::setPubDate(const TQString& guid, uint pubdate) { - if (tqcontains(guid)) + if (contains(guid)) d->entries[guid].pubDate = pubdate; } void FeedStorageDummyImpl::setGuidIsHash(const TQString& guid, bool isHash) { - if (tqcontains(guid)) + if (contains(guid)) d->entries[guid].guidIsHash = isHash; } void FeedStorageDummyImpl::setLink(const TQString& guid, const TQString& link) { - if (tqcontains(guid)) + if (contains(guid)) d->entries[guid].link = link; } void FeedStorageDummyImpl::setHash(const TQString& guid, uint hash) { - if (tqcontains(guid)) + if (contains(guid)) d->entries[guid].hash = hash; } void FeedStorageDummyImpl::setTitle(const TQString& guid, const TQString& title) { - if (tqcontains(guid)) + if (contains(guid)) d->entries[guid].title = title; } void FeedStorageDummyImpl::setDescription(const TQString& guid, const TQString& description) { - if (tqcontains(guid)) + if (contains(guid)) d->entries[guid].description = description; } void FeedStorageDummyImpl::setCommentsLink(const TQString& guid, const TQString& commentsLink) { - if (tqcontains(guid)) + if (contains(guid)) d->entries[guid].commentsLink = commentsLink; } void FeedStorageDummyImpl::setComments(const TQString& guid, int comments) { - if (tqcontains(guid)) + if (contains(guid)) d->entries[guid].comments = comments; } void FeedStorageDummyImpl::setGuidIsPermaLink(const TQString& guid, bool isPermaLink) { - if (tqcontains(guid)) + if (contains(guid)) d->entries[guid].guidIsPermaLink = isPermaLink; } void FeedStorageDummyImpl::addTag(const TQString& guid, const TQString& tag) { - if (tqcontains(guid)) + if (contains(guid)) { d->entries[guid].tags.append(tag); - if (!d->taggedArticles[tag].tqcontains(guid)) + if (!d->taggedArticles[tag].contains(guid)) d->taggedArticles[tag].append(guid); - if (!d->tags.tqcontains(tag)) + if (!d->tags.contains(tag)) d->tags.append(tag); } @@ -333,7 +333,7 @@ void FeedStorageDummyImpl::addTag(const TQString& guid, const TQString& tag) void FeedStorageDummyImpl::addCategory(const TQString& guid, const Category& cat) { - if (!tqcontains(guid)) + if (!contains(guid)) return; d->entries[guid].categories.append(cat); @@ -345,19 +345,19 @@ void FeedStorageDummyImpl::addCategory(const TQString& guid, const Category& cat void FeedStorageDummyImpl::setAuthor(const TQString& guid, const TQString& author) { - if (tqcontains(guid)) + if (contains(guid)) d->entries[guid].author = author; } TQString FeedStorageDummyImpl::author(const TQString& guid) { - return tqcontains(guid) ? d->entries[guid].author : TQString(); + return contains(guid) ? d->entries[guid].author : TQString(); } TQValueList FeedStorageDummyImpl::categories(const TQString& guid) { if (!guid.isNull()) - return tqcontains(guid) ? d->entries[guid].categories : TQValueList(); + return contains(guid) ? d->entries[guid].categories : TQValueList(); else return d->categories; } @@ -365,7 +365,7 @@ TQValueList FeedStorageDummyImpl::categories(const TQString& guid) void FeedStorageDummyImpl::removeTag(const TQString& guid, const TQString& tag) { - if (tqcontains(guid)) + if (contains(guid)) { d->entries[guid].tags.remove(tag); d->taggedArticles[tag].remove(guid); @@ -377,7 +377,7 @@ void FeedStorageDummyImpl::removeTag(const TQString& guid, const TQString& tag) TQStringList FeedStorageDummyImpl::tags(const TQString& guid) { if (!guid.isNull()) - return tqcontains(guid) ? d->entries[guid].tags : TQStringList(); + return contains(guid) ? d->entries[guid].tags : TQStringList(); else { return d->tags; @@ -396,7 +396,7 @@ void FeedStorageDummyImpl::add(FeedStorage* source) void FeedStorageDummyImpl::copyArticle(const TQString& guid, FeedStorage* source) { - if (!tqcontains(guid)) + if (!contains(guid)) addEntry(guid); setComments(guid, source->comments(guid)); @@ -424,7 +424,7 @@ void FeedStorageDummyImpl::clear() void FeedStorageDummyImpl::setEnclosure(const TQString& guid, const TQString& url, const TQString& type, int length) { - if (tqcontains(guid)) + if (contains(guid)) { FeedStorageDummyImplPrivate::Entry entry = d->entries[guid]; entry.hasEnclosure = true; @@ -436,7 +436,7 @@ void FeedStorageDummyImpl::setEnclosure(const TQString& guid, const TQString& ur void FeedStorageDummyImpl::removeEnclosure(const TQString& guid) { - if (tqcontains(guid)) + if (contains(guid)) { FeedStorageDummyImplPrivate::Entry entry = d->entries[guid]; entry.hasEnclosure = false; @@ -448,7 +448,7 @@ void FeedStorageDummyImpl::removeEnclosure(const TQString& guid) void FeedStorageDummyImpl::enclosure(const TQString& guid, bool& hasEnclosure, TQString& url, TQString& type, int& length) { - if (tqcontains(guid)) + if (contains(guid)) { FeedStorageDummyImplPrivate::Entry entry = d->entries[guid]; hasEnclosure = entry.hasEnclosure; diff --git a/akregator/src/feedstoragedummyimpl.h b/akregator/src/feedstoragedummyimpl.h index 4ba4a460..bd71a11c 100644 --- a/akregator/src/feedstoragedummyimpl.h +++ b/akregator/src/feedstoragedummyimpl.h @@ -50,7 +50,7 @@ class FeedStorageDummyImpl : public FeedStorage virtual TQStringList articles(const Category& cat); - virtual bool tqcontains(const TQString& guid); + virtual bool contains(const TQString& guid); virtual void addEntry(const TQString& guid); virtual void deleteArticle(const TQString& guid); virtual int comments(const TQString& guid); diff --git a/akregator/src/fetchqueue.cpp b/akregator/src/fetchqueue.cpp index d171d25e..c00abe2e 100644 --- a/akregator/src/fetchqueue.cpp +++ b/akregator/src/fetchqueue.cpp @@ -72,7 +72,7 @@ void FetchQueue::slotAbort() void FetchQueue::addFeed(Feed *f) { - if (!d->queuedFeeds.tqcontains(f) && !d->fetchingFeeds.tqcontains(f)) + if (!d->queuedFeeds.contains(f) && !d->fetchingFeeds.contains(f)) { connectToFeed(f); d->queuedFeeds.append(f); diff --git a/akregator/src/folder.cpp b/akregator/src/folder.cpp index d55c75ae..2a0f2776 100644 --- a/akregator/src/folder.cpp +++ b/akregator/src/folder.cpp @@ -99,7 +99,7 @@ TQStringList Folder::tags() const // intersect tag sets instead of appending lists, to avoid dupes. This sucks. Definitely. I want TQSet. Now. TQStringList t2 = (*it)->tags(); for (TQStringList::ConstIterator it2 = t2.begin(); it2 != t2.end(); ++it2) - if (!t.tqcontains(*it2)) + if (!t.contains(*it2)) t.append(*it2); } return t; @@ -137,7 +137,7 @@ TQValueList Folder::tqchildren() const void Folder::insertChild(TreeNode* node, TreeNode* after) { - int pos = d->tqchildren.tqfindIndex(after); + int pos = d->tqchildren.findIndex(after); if (pos < 0) prependChild(node); @@ -202,7 +202,7 @@ void Folder::prependChild(TreeNode* node) void Folder::removeChild(TreeNode* node) { // kdDebug() << "enter Folder::removeChild() node:" << (node ? node->title() : "null") << endl; - if (node && d->tqchildren.tqcontains(node)) + if (node && d->tqchildren.contains(node)) { node->setParent(0); d->tqchildren.remove(node); diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp index 55fac570..e800bafd 100644 --- a/akregator/src/frame.cpp +++ b/akregator/src/frame.cpp @@ -123,7 +123,7 @@ void Frame::setCaption(const TQString &s) void Frame::seStatusText(const TQString &s) { m_statusText=s; - m_statusText.tqreplace(TQRegExp("<[^>]*>"), ""); + m_statusText.replace(TQRegExp("<[^>]*>"), ""); emit statusText(m_statusText); } diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp index 72058fa0..baaa6409 100644 --- a/akregator/src/librss/tools_p.cpp +++ b/akregator/src/librss/tools_p.cpp @@ -24,7 +24,7 @@ time_t parseISO8601Date(const TQString &s) return 0; // error // FIXME: imho this is done in KRFCDate::parseDateISO8601() automatically, so we could omit it? -fo - if (s.tqfind('T') != -1) + if (s.find('T') != -1) return KRFCDate::parseDateISO8601(s); else return KRFCDate::parseDateISO8601(s + "T12:00:00"); @@ -43,11 +43,11 @@ TQString childNodesAsXML(const TQDomNode& tqparent) static TQString plainTextToHtml(const TQString& plainText) { TQString str(plainText); - str.tqreplace("&", "&"); - str.tqreplace("\"", """); - str.tqreplace("<", "<"); - //str.tqreplace(">", ">"); - str.tqreplace("\n", "
"); + str.replace("&", "&"); + str.replace("\"", """); + str.replace("<", "<"); + //str.replace(">", ">"); + str.replace("\n", "
"); return str; } @@ -84,7 +84,7 @@ static ContentFormat mapTypeToFormat(const TQString& modep, const TQString& type xmltypes.append(TQString::fromUtf8("application/xml-dtd")); - if (xmltypes.tqcontains(type) + if (xmltypes.contains(type) || type.tqendsWith(TQString::fromUtf8("+xml"), false) || type.tqendsWith(TQString::fromUtf8("/xml"), false)) return XML; @@ -102,7 +102,7 @@ static TQString extractAtomContent(const TQDomElement& e) { case HTML: { - const bool hasPre = e.text().tqcontains( "
", false ) || e.text().tqcontains( "
", false ) || e.text().contains( "
", false) || result.tqcontains("
 regexp
+            bool hasPre = result.contains("
", false) || result.contains("
 regexp
             if(!isInlined && !hasHtml)						// perform nl2br if not a inline elt and it has no html elts
-                    result = result = result.tqreplace(TQChar('\n'), "
");
+                    result = result = result.replace(TQChar('\n'), "
");
             if(!hasPre)										// strip white spaces if no 
                     result = result.simplifyWhiteSpace();
         }
@@ -151,7 +151,7 @@ TQString extractTitle(const TQDomNode & tqparent)
 
     TQString result = node.toElement().text();
 
-    result = KCharsets::resolveEntities(KCharsets::resolveEntities(result).tqreplace(TQRegExp("<[^>]*>"), "").remove("\\"));
+    result = KCharsets::resolveEntities(KCharsets::resolveEntities(result).replace(TQRegExp("<[^>]*>"), "").remove("\\"));
 	result = result.simplifyWhiteSpace();
 
     if (result.isEmpty())
@@ -177,7 +177,7 @@ static void authorFromString(const TQString& strp, TQString& name, TQString& ema
     {
         TQString all = remail.cap(0);
         email = remail.cap(1);
-        str.tqreplace(all, ""); // remove mail address
+        str.replace(all, ""); // remove mail address
     }
     
     // simplify the rest and use it as name
diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp
index ec0fe7b6..75ee1e2f 100644
--- a/akregator/src/mk4storage/feedstoragemk4impl.cpp
+++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp
@@ -147,8 +147,8 @@ FeedStorageMK4Impl::FeedStorageMK4Impl(const TQString& url, StorageMK4Impl* main
     kdDebug() << url2 << endl;
     TQString t = url2;
     TQString t2 = url2;
-    TQString filePath = main->archivePath() +"/"+ t.tqreplace("/", "_").tqreplace(":", "_");
-    d->oldArchivePath = KGlobal::dirs()->saveLocation("data", "akregator/Archive/") + t2.tqreplace("/", "_").tqreplace(":", "_") + ".xml";
+    TQString filePath = main->archivePath() +"/"+ t.replace("/", "_").replace(":", "_");
+    d->oldArchivePath = KGlobal::dirs()->saveLocation("data", "akregator/Archive/") + t2.replace("/", "_").replace(":", "_") + ".xml";
 
     d->convert = !TQFile::exists(filePath + ".mk4") && TQFile::exists(d->oldArchivePath);
     d->storage = new c4_Storage((filePath + ".mk4").local8Bit(), true);
@@ -297,7 +297,7 @@ void FeedStorageMK4Impl::addEntry(const TQString& guid)
 {
     c4_Row row;
     d->pguid(row) = guid.ascii();
-    if (!tqcontains(guid))
+    if (!contains(guid))
     {
         d->archiveView.Add(row);
         markDirty();
@@ -305,7 +305,7 @@ void FeedStorageMK4Impl::addEntry(const TQString& guid)
     }
 }
 
-bool FeedStorageMK4Impl::tqcontains(const TQString& guid)
+bool FeedStorageMK4Impl::contains(const TQString& guid)
 {
     return findArticle(guid) != -1;
 }
@@ -789,7 +789,7 @@ void FeedStorageMK4Impl::add(FeedStorage* source)
 
 void FeedStorageMK4Impl::copyArticle(const TQString& guid, FeedStorage* source)
 {
-    if (!tqcontains(guid))
+    if (!contains(guid))
         addEntry(guid);
     setComments(guid, source->comments(guid));
     setCommentsLink(guid, source->commentsLink(guid));
diff --git a/akregator/src/mk4storage/feedstoragemk4impl.h b/akregator/src/mk4storage/feedstoragemk4impl.h
index d13f04de..057ba2e7 100644
--- a/akregator/src/mk4storage/feedstoragemk4impl.h
+++ b/akregator/src/mk4storage/feedstoragemk4impl.h
@@ -50,7 +50,7 @@ class FeedStorageMK4Impl : public FeedStorage
 
         virtual TQStringList articles(const Category& cat);
 
-        virtual bool tqcontains(const TQString& guid);
+        virtual bool contains(const TQString& guid);
         virtual void addEntry(const TQString& guid);
         virtual void deleteArticle(const TQString& guid);
         virtual int comments(const TQString& guid);
diff --git a/akregator/src/mk4storage/metakit/CHANGES b/akregator/src/mk4storage/metakit/CHANGES
index e5d4aad1..1e1761ca 100644
--- a/akregator/src/mk4storage/metakit/CHANGES
+++ b/akregator/src/mk4storage/metakit/CHANGES
@@ -1198,7 +1198,7 @@
 
     Moved C++ member documentation out of "mk4.h" header.  Added
     examples/ directory, with a find.py timing example.  Fixed bugs in
-    new Mk4tcl: "$vw tqfind" and "$vw delete end".  Added tests for new
+    new Mk4tcl: "$vw find" and "$vw delete end".  Added tests for new
     Mk4tcl OO interface: ":mk5object.test".
 
 2000-06-16    Improved modifiable custom viewers
diff --git a/akregator/src/mk4storage/metakit/include/mk4str.inl b/akregator/src/mk4storage/metakit/include/mk4str.inl
index eddbefb8..4f95fa51 100644
--- a/akregator/src/mk4storage/metakit/include/mk4str.inl
+++ b/akregator/src/mk4storage/metakit/include/mk4str.inl
@@ -131,12 +131,12 @@ d4_inline bool c4_String::operator< (const c4_String& str_) const
 
 d4_inline int c4_String::Find(char ch_) const
 {
-    return tqfind(ch_);
+    return find(ch_);
 }
 
 d4_inline int c4_String::ReverseFind(char ch_) const
 {
-    return rtqfind(ch_);
+    return rfind(ch_);
 }
 
 d4_inline int c4_String::FindOneOf(const char* set_) const
@@ -146,7 +146,7 @@ d4_inline int c4_String::FindOneOf(const char* set_) const
 
 d4_inline int c4_String::Find(const char* sub_) const
 {
-    return tqfind(sub_);
+    return find(sub_);
 }
 
 d4_inline c4_String c4_String::SpanIncluding(const char* set_) const
diff --git a/akregator/src/mk4storage/metakit/src/store.cpp b/akregator/src/mk4storage/metakit/src/store.cpp
index 3a458337..a32de665 100644
--- a/akregator/src/mk4storage/metakit/src/store.cpp
+++ b/akregator/src/mk4storage/metakit/src/store.cpp
@@ -161,7 +161,7 @@ void c4_Notifier::Notify()
  *  Manager for persistent storage of view structures.
  *
  *  The storage class uses a view, with additional functionality to be able 
- *  to store and reload the data it tqcontains (including nested subviews).
+ *  to store and reload the data it contains (including nested subviews).
  *
  *  By default, data is loaded on demand, i.e. whenever data which has
  *  not yet been referenced is used for the first time.  Loading is limited
diff --git a/akregator/src/mk4storage/storagemk4impl.cpp b/akregator/src/mk4storage/storagemk4impl.cpp
index af71d97b..becbd518 100644
--- a/akregator/src/mk4storage/storagemk4impl.cpp
+++ b/akregator/src/mk4storage/storagemk4impl.cpp
@@ -276,7 +276,7 @@ void StorageMK4Impl::slotCommit()
 
 FeedStorage* StorageMK4Impl::archiveFor(const TQString& url)
 {
-    if (!d->feeds.tqcontains(url))
+    if (!d->feeds.contains(url))
     {
         FeedStorage* fs = new FeedStorageMK4Impl(url, this);
         d->feeds[url] = fs;
diff --git a/akregator/src/nodelist.cpp b/akregator/src/nodelist.cpp
index edea9c6e..1ed274d1 100644
--- a/akregator/src/nodelist.cpp
+++ b/akregator/src/nodelist.cpp
@@ -216,7 +216,7 @@ int NodeList::generateID()
 void NodeList::slotNodeAdded(TreeNode* node)
 {
     Folder* tqparent = node->tqparent();
-    if ( !node || !d->flatList.tqcontains(tqparent) || d->flatList.tqcontains(node) )
+    if ( !node || !d->flatList.contains(tqparent) || d->flatList.contains(node) )
         return;
 
     addNode(node, false);
@@ -224,7 +224,7 @@ void NodeList::slotNodeAdded(TreeNode* node)
 
 void NodeList::slotNodeDestroyed(TreeNode* node)
 {
-    if ( !node || !d->flatList.tqcontains(node) )
+    if ( !node || !d->flatList.contains(node) )
         return;
 
     removeNode(node);
@@ -232,7 +232,7 @@ void NodeList::slotNodeDestroyed(TreeNode* node)
 
 void NodeList::slotNodeRemoved(Folder* /*tqparent*/, TreeNode* node)
 {
-    if ( !node || !d->flatList.tqcontains(node) )
+    if ( !node || !d->flatList.contains(node) )
         return;
 
     removeNode(node);
diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index 8d10256c..0392535c 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -390,7 +390,7 @@ void PageViewer::slotPaletteOrFontChanged()
     if ( !obj ) // not all views have a browser extension !
         return;
     
-    int id = obj->tqmetaObject()->tqfindSlot("reparseConfiguration()");
+    int id = obj->tqmetaObject()->findSlot("reparseConfiguration()");
     if (id == -1)
         return;
     TQUObject o[1];
diff --git a/akregator/src/pageviewer.rc b/akregator/src/pageviewer.rc
index a7b98fee..dd44ee36 100644
--- a/akregator/src/pageviewer.rc
+++ b/akregator/src/pageviewer.rc
@@ -17,7 +17,7 @@
   
   
   
-  
+
diff --git a/akregator/src/plugin.cpp b/akregator/src/plugin.cpp index 599d3972..495dabc3 100644 --- a/akregator/src/plugin.cpp +++ b/akregator/src/plugin.cpp @@ -25,7 +25,7 @@ Plugin::addPluginProperty( const TQString& key, const TQString& value ) TQString Plugin::pluginProperty( const TQString& key ) { - if ( m_properties.tqfind( key.lower() ) == m_properties.end() ) + if ( m_properties.find( key.lower() ) == m_properties.end() ) return "false"; return m_properties[key.lower()]; @@ -35,7 +35,7 @@ Plugin::pluginProperty( const TQString& key ) bool Plugin::hasPluginProperty( const TQString& key ) { - return m_properties.tqfind( key.lower() ) != m_properties.end(); + return m_properties.find( key.lower() ) != m_properties.end(); } } diff --git a/akregator/src/progressmanager.cpp b/akregator/src/progressmanager.cpp index 6ef94f4c..931b0476 100644 --- a/akregator/src/progressmanager.cpp +++ b/akregator/src/progressmanager.cpp @@ -102,7 +102,7 @@ void ProgressManager::slotNodeAdded(TreeNode* node) Feed* feed = dynamic_cast(node); if (feed) { - if (!d->handlers.tqcontains(feed)) + if (!d->handlers.contains(feed)) d->handlers[feed] = new ProgressItemHandler(feed); connect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotNodeDestroyed(TreeNode*))); } diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp index 57612bd4..c4e91e5a 100644 --- a/akregator/src/simplenodeselector.cpp +++ b/akregator/src/simplenodeselector.cpp @@ -185,7 +185,7 @@ void SimpleNodeSelector::slotItemSelected(TQListViewItem* item) void SimpleNodeSelector::slotNodeDestroyed(TreeNode* node) { - if (d->nodeToItem.tqcontains(node)) + if (d->nodeToItem.contains(node)) { TQListViewItem* item = d->nodeToItem[node]; d->nodeToItem.remove(node); diff --git a/akregator/src/speechclient.cpp b/akregator/src/speechclient.cpp index b0fc92c9..8665213d 100644 --- a/akregator/src/speechclient.cpp +++ b/akregator/src/speechclient.cpp @@ -135,7 +135,7 @@ void SpeechClient::slotAbortJobs() ASYNC SpeechClient::textRemoved(const TQCString& /*appId*/, uint jobNum) { kdDebug() << "SpeechClient::textRemoved() called" << endl; - if (d->pendingJobs.tqcontains(jobNum)) + if (d->pendingJobs.contains(jobNum)) { d->pendingJobs.remove(jobNum); if (d->pendingJobs.isEmpty()) diff --git a/akregator/src/storagedummyimpl.cpp b/akregator/src/storagedummyimpl.cpp index e8d5c4c0..393be7d1 100644 --- a/akregator/src/storagedummyimpl.cpp +++ b/akregator/src/storagedummyimpl.cpp @@ -100,12 +100,12 @@ bool StorageDummyImpl::rollback() int StorageDummyImpl::unreadFor(const TQString &url) { - return d->feeds.tqcontains(url) ? d->feeds[url].unread : 0; + return d->feeds.contains(url) ? d->feeds[url].unread : 0; } void StorageDummyImpl::setUnreadFor(const TQString &url, int unread) { - if (!d->feeds.tqcontains(url)) + if (!d->feeds.contains(url)) d->addEntry(url, unread, unread, 0); else d->feeds[url].unread = unread; @@ -113,12 +113,12 @@ void StorageDummyImpl::setUnreadFor(const TQString &url, int unread) int StorageDummyImpl::totalCountFor(const TQString &url) { - return d->feeds.tqcontains(url) ? d->feeds[url].totalCount : 0; + return d->feeds.contains(url) ? d->feeds[url].totalCount : 0; } void StorageDummyImpl::setTotalCountFor(const TQString &url, int total) { - if (!d->feeds.tqcontains(url)) + if (!d->feeds.contains(url)) d->addEntry(url, 0, total, 0); else d->feeds[url].totalCount = total; @@ -126,12 +126,12 @@ void StorageDummyImpl::setTotalCountFor(const TQString &url, int total) int StorageDummyImpl::lastFetchFor(const TQString& url) { - return d->feeds.tqcontains(url) ? d->feeds[url].lastFetch : 0; + return d->feeds.contains(url) ? d->feeds[url].lastFetch : 0; } void StorageDummyImpl::setLastFetchFor(const TQString& url, int lastFetch) { - if (!d->feeds.tqcontains(url)) + if (!d->feeds.contains(url)) d->addEntry(url, 0, 0, lastFetch); else d->feeds[url].lastFetch = lastFetch; @@ -143,7 +143,7 @@ void StorageDummyImpl::slotCommit() FeedStorage* StorageDummyImpl::archiveFor(const TQString& url) { - if (!d->feeds.tqcontains(url)) + if (!d->feeds.contains(url)) d->feeds[url].feedStorage = new FeedStorageDummyImpl(url, this); return d->feeds[url].feedStorage; diff --git a/akregator/src/storagefactoryregistry.cpp b/akregator/src/storagefactoryregistry.cpp index 608c05b1..50fb6005 100644 --- a/akregator/src/storagefactoryregistry.cpp +++ b/akregator/src/storagefactoryregistry.cpp @@ -70,7 +70,7 @@ StorageFactory* StorageFactoryRegistry::getFactory(const TQString& typestr) bool StorageFactoryRegistry::containsFactory(const TQString& typestr) const { - return d->map.tqcontains(typestr); + return d->map.contains(typestr); } TQStringList StorageFactoryRegistry::list() const diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp index 60ba42b3..cbd7e737 100644 --- a/akregator/src/tabwidget.cpp +++ b/akregator/src/tabwidget.cpp @@ -218,7 +218,7 @@ void TabWidget::setTitle( const TQString &title , TQWidget* sender) newTitle = newTitle.left( newMaxLength-3 ) + "..."; } - newTitle.tqreplace( '&', "&&" ); + newTitle.replace( '&', "&&" ); if ( tabLabel( sender ) != newTitle ) changeTab( sender, newTitle ); @@ -235,7 +235,7 @@ void TabWidget::setTitle( const TQString &title , TQWidget* sender) newTitle = newTitle.left( newMaxLength-3 ) + "..."; } - newTitle.tqreplace( '&', "&&" ); + newTitle.replace( '&', "&&" ); if ( newTitle != tabLabel( page( i ) ) ) changeTab( page( i ), newTitle ); } @@ -298,8 +298,8 @@ void TabWidget::slotCloseTab() d->currentItem = currentPage(); if (indexOf(d->currentItem) == 0) return; - if (d->frames.tqfind(d->currentItem) != NULL) - removeFrame(d->frames.tqfind(d->currentItem)); + if (d->frames.find(d->currentItem) != NULL) + removeFrame(d->frames.find(d->currentItem)); delete d->currentItem; d->currentItem = 0; } @@ -323,8 +323,8 @@ void TabWidget::initiateDrag(int tab) void TabWidget::slotCloseRequest(TQWidget* widget) { - if (d->frames.tqfind(widget) != NULL) - removeFrame(d->frames.tqfind(widget)); + if (d->frames.find(widget) != NULL) + removeFrame(d->frames.find(widget)); } } // namespace Akregator diff --git a/akregator/src/tagnode.cpp b/akregator/src/tagnode.cpp index 35c72072..24d81755 100644 --- a/akregator/src/tagnode.cpp +++ b/akregator/src/tagnode.cpp @@ -196,7 +196,7 @@ void TagNode::slotArticlesAdded(TreeNode* node, const TQValueList
& list bool added = false; for (TQValueList
::ConstIterator it = list.begin(); it != list.end(); ++it) { - if (!d->articles.tqcontains(*it) && d->filter.matches(*it)) + if (!d->articles.contains(*it) && d->filter.matches(*it)) { d->articles.append(*it); d->addedArticlesNotify.append(*it); @@ -216,7 +216,7 @@ void TagNode::slotArticlesUpdated(TreeNode* node, const TQValueList
& li bool updated = false; for (TQValueList
::ConstIterator it = list.begin(); it != list.end(); ++it) { - if (d->articles.tqcontains(*it)) + if (d->articles.contains(*it)) { if (!d->filter.matches(*it)) // articles is in list, but doesn't match our criteria anymore -> remove it { @@ -252,7 +252,7 @@ void TagNode::slotArticlesRemoved(TreeNode* node, const TQValueList
& li bool removed = false; for (TQValueList
::ConstIterator it = list.begin(); it != list.end(); ++it) { - if (d->articles.tqcontains(*it)) + if (d->articles.contains(*it)) { d->articles.remove(*it); d->removedArticlesNotify.append(*it); diff --git a/akregator/src/tagnode.h b/akregator/src/tagnode.h index 8598a8a2..ebdf15a0 100644 --- a/akregator/src/tagnode.h +++ b/akregator/src/tagnode.h @@ -76,7 +76,7 @@ public: virtual int totalCount() const; - /** Returns a sequence of the articles this node tqcontains. For feed groups, this returns a concatenated list of all articles in the sub tree. + /** Returns a sequence of the articles this node contains. For feed groups, this returns a concatenated list of all articles in the sub tree. If @c tag is not null, only articles tagged with @c tag are returned @return sequence of articles */ diff --git a/akregator/src/tagnodelist.cpp b/akregator/src/tagnodelist.cpp index ba531d03..cf87b770 100644 --- a/akregator/src/tagnodelist.cpp +++ b/akregator/src/tagnodelist.cpp @@ -158,7 +158,7 @@ void TagNodeList::slotNodeRemoved(Folder* tqparent, TreeNode* node) bool TagNodeList::containsTagId(const TQString& tagId) { - return d->tagIdToNodeMap.tqcontains(tagId); + return d->tagIdToNodeMap.contains(tagId); } TQValueList TagNodeList::toList() const diff --git a/akregator/src/tagset.cpp b/akregator/src/tagset.cpp index 1be7f952..a6b41285 100644 --- a/akregator/src/tagset.cpp +++ b/akregator/src/tagset.cpp @@ -54,7 +54,7 @@ TagSet::~TagSet() void TagSet::insert(const Tag& tag) { - if (!d->map.tqcontains(tag.id())) + if (!d->map.contains(tag.id())) { d->map.insert(tag.id(), tag); tag.addedToTagSet(this); @@ -64,7 +64,7 @@ void TagSet::insert(const Tag& tag) void TagSet::remove(const Tag& tag) { - if (d->map.tqcontains(tag.id())) + if (d->map.contains(tag.id())) { d->map.remove(tag.id()); tag.removedFromTagSet(this); @@ -74,17 +74,17 @@ void TagSet::remove(const Tag& tag) bool TagSet::containsID(const TQString& id) const { - return d->map.tqcontains(id); + return d->map.contains(id); } -bool TagSet::tqcontains(const Tag& tag) const +bool TagSet::contains(const Tag& tag) const { - return d->map.tqcontains(tag.id()); + return d->map.contains(tag.id()); } Tag TagSet::findByID(const TQString& id) const { - return d->map.tqcontains(id) ? d->map[id] : Tag(); + return d->map.contains(id) ? d->map[id] : Tag(); } TQMap TagSet::toMap() const diff --git a/akregator/src/tagset.h b/akregator/src/tagset.h index 637fce50..49b19aed 100644 --- a/akregator/src/tagset.h +++ b/akregator/src/tagset.h @@ -63,8 +63,8 @@ class TagSet : public TQObject /** returns the tag set as map ((id, Tag) pairs) */ TQMap toMap() const; - /** returns @c true if this set tqcontains @c tag */ - bool tqcontains(const Tag& tag) const; + /** returns @c true if this set contains @c tag */ + bool contains(const Tag& tag) const; /** returns @c true if this set contains a tag with a given ID */ bool containsID(const TQString& id) const; diff --git a/akregator/src/treenode.cpp b/akregator/src/treenode.cpp index 27ee2eca..58e4ae8e 100644 --- a/akregator/src/treenode.cpp +++ b/akregator/src/treenode.cpp @@ -96,7 +96,7 @@ TreeNode* TreeNode::nextSibling() const TQValueList tqchildren = d->tqparent->tqchildren(); TreeNode* me = (TreeNode*)this; - int idx = tqchildren.tqfindIndex(me); + int idx = tqchildren.findIndex(me); return idx+1 < tqchildren.size() ? *(tqchildren.at(idx+1)) : 0L; } @@ -108,7 +108,7 @@ TreeNode* TreeNode::prevSibling() const TQValueList tqchildren = d->tqparent->tqchildren(); TreeNode* me = (TreeNode*)this; - int idx = tqchildren.tqfindIndex(me); + int idx = tqchildren.findIndex(me); return idx > 0 ? *(d->tqparent->tqchildren().at(idx-1)) : 0L; } diff --git a/akregator/src/treenode.h b/akregator/src/treenode.h index d6c6f860..b50b050a 100644 --- a/akregator/src/treenode.h +++ b/akregator/src/treenode.h @@ -112,7 +112,7 @@ public: virtual void setParent(Folder* tqparent); - /** Returns a sequence of the articles this node tqcontains. For feed groups, this returns a concatenated list of all articles in the sub tree. + /** Returns a sequence of the articles this node contains. For feed groups, this returns a concatenated list of all articles in the sub tree. If @c tag is not null, only articles tagged with @c tag are returned @return sequence of articles */ diff --git a/akregator/src/utils.cpp b/akregator/src/utils.cpp index fb7b0186..6bc6cf14 100644 --- a/akregator/src/utils.cpp +++ b/akregator/src/utils.cpp @@ -30,7 +30,7 @@ namespace Akregator { TQString Utils::stripTags(const TQString& str) { - return TQString(str).tqreplace(TQRegExp("<[^>]*>"), ""); + return TQString(str).replace(TQRegExp("<[^>]*>"), ""); } uint Utils::calcHash(const TQString& str) @@ -48,7 +48,7 @@ TQString Utils::fileNameForUrl(const TQString& url_p) { TQString url2(url_p); - url2 = url2.tqreplace("/", "_").tqreplace(":", "_"); + url2 = url2.replace("/", "_").replace(":", "_"); if (url2.length() > 255) url2 = url2.left(200) + TQString::number(Akregator::Utils::calcHash(url2), 16); diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp index 989ff8ae..4302f0a7 100644 --- a/akregator/src/viewer.cpp +++ b/akregator/src/viewer.cpp @@ -112,7 +112,7 @@ void Viewer::displayInExternalBrowser(const KURL &url, const TQString &mimetype) { TQString cmd = Settings::externalBrowserCustomCommand(); TQString urlStr = url.url(); - cmd.tqreplace(TQRegExp("%u"), urlStr); + cmd.replace(TQRegExp("%u"), urlStr); KProcess *proc = new KProcess; TQStringList cmdAndArgs = KShell::splitArgs(cmd); *proc << cmdAndArgs; @@ -202,7 +202,7 @@ void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, c void Viewer::slotCopy() { TQString text = selectedText(); - text.tqreplace( TQChar( 0xa0 ), ' ' ); + text.replace( TQChar( 0xa0 ), ' ' ); TQClipboard *cb = TQApplication::tqclipboard(); disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); cb->setText(text); -- cgit v1.2.3