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 --- libkdepim/kscoring.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'libkdepim/kscoring.cpp') diff --git a/libkdepim/kscoring.cpp b/libkdepim/kscoring.cpp index 58595b933..cf02d88f4 100644 --- a/libkdepim/kscoring.cpp +++ b/libkdepim/kscoring.cpp @@ -47,19 +47,19 @@ static TQString toXml(const TQString& str) uint i = 0; while ( i < len ) { if (tmp[(int)i] == '<') { - tmp.tqreplace(i, 1, "<"); + tmp.replace(i, 1, "<"); len += 3; i += 4; } else if (tmp[(int)i] == '"') { - tmp.tqreplace(i, 1, """); + tmp.replace(i, 1, """); len += 5; i += 6; } else if (tmp[(int)i] == '&') { - tmp.tqreplace(i, 1, "&"); + tmp.replace(i, 1, "&"); len += 4; i += 5; } else if (tmp[(int)i] == '>') { - tmp.tqreplace(i, 1, ">"); + tmp.replace(i, 1, ">"); len += 3; i += 4; } else { @@ -91,7 +91,7 @@ NotifyDialog::NotifyDialog(TQWidget* p) void NotifyDialog::slotShowAgainToggled(bool flag) { - dict.tqreplace(msg,!flag); + dict.replace(msg,!flag); kdDebug(5100) << "note \"" << note << "\" will popup again: " << flag << endl; } @@ -101,7 +101,7 @@ void NotifyDialog::display(ScorableArticle& a, const TQString& s) if (!me) me = new NotifyDialog(); me->msg = s; - NotesMap::Iterator i = dict.tqfind(s); + NotesMap::Iterator i = dict.find(s); if (i == dict.end() || i.data()) { TQString msg = i18n("Article\n%1
%2
caused the following" " note to appear:
%3"). @@ -109,7 +109,7 @@ void NotifyDialog::display(ScorableArticle& a, const TQString& s) arg(a.subject()). arg(s); me->note->setText(msg); - if ( i == dict.end() ) i = dict.tqreplace(s,false); + if ( i == dict.end() ) i = dict.replace(s,false); me->adjustSize(); me->exec(); } @@ -348,10 +348,10 @@ NotifyCollection::~NotifyCollection() void NotifyCollection::addNote(const ScorableArticle& a, const TQString& note) { - article_list *l = notifyList.tqfind(note); + article_list *l = notifyList.find(note); if (!l) { notifyList.insert(note,new article_list); - l = notifyList.tqfind(note); + l = notifyList.find(note); } article_info i; i.from = a.from(); @@ -514,7 +514,7 @@ bool KScoringExpression::match(ScorableArticle& a) const res = (head.lower() == expr_str.lower()); break; case CONTAINS: - res = (head.lower().tqfind(expr_str.lower()) >= 0); + res = (head.lower().find(expr_str.lower()) >= 0); break; case MATCH: case MATCHCS: @@ -936,7 +936,7 @@ KScoringRule* KScoringManager::addRule(const ScorableArticle& a, TQString group, KScoringRule* KScoringManager::addRule(KScoringRule* expr) { - int i = allRules.tqfindRef(expr); + int i = allRules.findRef(expr); if (i == -1) { // only add a rule we don't know addRuleInternal(expr); @@ -965,7 +965,7 @@ void KScoringManager::addRuleInternal(KScoringRule *e) void KScoringManager::cancelNewRule(KScoringRule *r) { // if e was'nt previously added to the list of rules, we delete it - int i = allRules.tqfindRef(r); + int i = allRules.findRef(r); if (i == -1) { kdDebug(5100) << "deleting rule " << r->getName() << endl; deleteRule(r); @@ -1002,7 +1002,7 @@ void KScoringManager::setRuleName(KScoringRule *r, const TQString& s) void KScoringManager::deleteRule(KScoringRule *r) { - int i = allRules.tqfindRef(r); + int i = allRules.findRef(r); if (i != -1) { allRules.remove(); emit changedRules(); @@ -1019,8 +1019,8 @@ void KScoringManager::editRule(KScoringRule *e, TQWidget *w) void KScoringManager::moveRuleAbove( KScoringRule *above, KScoringRule *below ) { - int aindex = allRules.tqfindRef( above ); - int bindex = allRules.tqfindRef( below ); + int aindex = allRules.findRef( above ); + int bindex = allRules.findRef( below ); if ( aindex <= 0 || bindex < 0 ) return; if ( aindex < bindex ) @@ -1031,8 +1031,8 @@ void KScoringManager::moveRuleAbove( KScoringRule *above, KScoringRule *below ) void KScoringManager::moveRuleBelow( KScoringRule *below, KScoringRule *above ) { - int bindex = allRules.tqfindRef( below ); - int aindex = allRules.tqfindRef( above ); + int bindex = allRules.findRef( below ); + int aindex = allRules.findRef( above ); if ( bindex < 0 || bindex >= (int)allRules.count() - 1 || aindex < 0 ) return; if ( bindex < aindex ) -- cgit v1.2.1