diff options
Diffstat (limited to 'libkdepim/kscoring.cpp')
| -rw-r--r-- | libkdepim/kscoring.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libkdepim/kscoring.cpp b/libkdepim/kscoring.cpp index c9d1f6143..8c5f737e6 100644 --- a/libkdepim/kscoring.cpp +++ b/libkdepim/kscoring.cpp @@ -15,10 +15,10 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ #ifdef KDE_USE_FINAL -#undef QT_NO_ASCII_CAST +#undef TQT_NO_ASCII_CAST #endif -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include <iostream> @@ -39,7 +39,7 @@ //---------------------------------------------------------------------------- -// a small function to encode attribute values, code stolen from QDom +// a small function to encode attribute values, code stolen from TQDom static TQString toXml(const TQString& str) { TQString tmp(str); @@ -101,7 +101,7 @@ void NotifyDialog::display(ScorableArticle& a, const TQString& s) if (!me) me = new NotifyDialog(); me->msg = s; - NotesMap::Iterator i = dict.find(s); + NotesMap::Iterator i = dict.tqfind(s); if (i == dict.end() || i.data()) { TQString msg = i18n("Article\n<b>%1</b><br><b>%2</b><br>caused the following" " note to appear:<br>%3"). @@ -348,10 +348,10 @@ NotifyCollection::~NotifyCollection() void NotifyCollection::addNote(const ScorableArticle& a, const TQString& note) { - article_list *l = notifyList.find(note); + article_list *l = notifyList.tqfind(note); if (!l) { notifyList.insert(note,new article_list); - l = notifyList.find(note); + l = notifyList.tqfind(note); } article_info i; i.from = a.from(); @@ -409,7 +409,7 @@ KScoringExpression::KScoringExpression(const TQString& h, const TQString& t, con expr.setCaseSensitive( true ); } else if (t == "CONTAINS" ) cond = CONTAINS; - else if (t == "EQUALS" ) cond = EQUALS; + else if (t == "ETQUALS" ) cond = ETQUALS; else if (t == "GREATER") { cond = GREATER; expr_int = expr_str.toInt(); @@ -435,7 +435,7 @@ int KScoringExpression::getConditionForName(const TQString& s) if (s == getNameForCondition(CONTAINS)) return CONTAINS; else if (s == getNameForCondition(MATCH)) return MATCH; else if (s == getNameForCondition(MATCHCS)) return MATCHCS; - else if (s == getNameForCondition(EQUALS)) return EQUALS; + else if (s == getNameForCondition(ETQUALS)) return ETQUALS; else if (s == getNameForCondition(SMALLER)) return SMALLER; else if (s == getNameForCondition(GREATER)) return GREATER; else { @@ -452,7 +452,7 @@ TQString KScoringExpression::getNameForCondition(int cond) case CONTAINS: return i18n("Contains Substring"); case MATCH: return i18n("Matches Regular Expression"); case MATCHCS: return i18n("Matches Regular Expression (Case Sensitive)"); - case EQUALS: return i18n("Is Exactly the Same As"); + case ETQUALS: return i18n("Is Exactly the Same As"); case SMALLER: return i18n("Less Than"); case GREATER: return i18n("Greater Than"); default: @@ -469,7 +469,7 @@ TQStringList KScoringExpression::conditionNames() l << getNameForCondition(CONTAINS); l << getNameForCondition(MATCH); l << getNameForCondition(MATCHCS); - l << getNameForCondition(EQUALS); + l << getNameForCondition(ETQUALS); l << getNameForCondition(SMALLER); l << getNameForCondition(GREATER); return l; @@ -510,11 +510,11 @@ bool KScoringExpression::match(ScorableArticle& a) const if (!head.isEmpty()) { switch (cond) { - case EQUALS: + case ETQUALS: res = (head.lower() == expr_str.lower()); break; case CONTAINS: - res = (head.lower().find(expr_str.lower()) >= 0); + res = (head.lower().tqfind(expr_str.lower()) >= 0); break; case MATCH: case MATCHCS: @@ -569,7 +569,7 @@ TQString KScoringExpression::getTypeString(int cond) case CONTAINS: return "CONTAINS"; case MATCH: return "MATCH"; case MATCHCS: return "MATCHCS"; - case EQUALS: return "EQUALS"; + case ETQUALS: return "ETQUALS"; case SMALLER: return "SMALLER"; case GREATER: return "GREATER"; default: |