From d497b1b0373d758ede3d877ab68c8d7c8ab29062 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 13 Jan 2012 15:08:46 -0600 Subject: Fix inadvertent TQt changes This closes Bug 752 --- libtdepim/kimportdialog.cpp | 20 ++++++++++---------- libtdepim/krsqueezedtextlabel.h | 6 +++--- libtdepim/kscoring.cpp | 12 ++++++------ libtdepim/kscoring.h | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) (limited to 'libtdepim') diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp index d7e5675eb..60d5c24f6 100644 --- a/libtdepim/kimportdialog.cpp +++ b/libtdepim/kimportdialog.cpp @@ -303,7 +303,7 @@ void KImportDialog::readFile( int rows ) mData.clear(); int row, column; - enum { S_START, S_TQUOTED_FIELD, S_MAYBE_END_OF_TQUOTED_FIELD, S_END_OF_TQUOTED_FIELD, + enum { S_START, S_QUOTED_FIELD, S_MAYBE_END_OF_QUOTED_FIELD, S_END_OF_QUOTED_FIELD, S_MAYBE_NORMAL_FIELD, S_NORMAL_FIELD } state = S_START; TQChar m_textquote = '"'; @@ -347,7 +347,7 @@ void KImportDialog::readFile( int rows ) case S_START : if (x == m_textquote) { field += x; - state = S_TQUOTED_FIELD; + state = S_QUOTED_FIELD; } else if (x == mSeparator) { ++column; } else if (x == '\n') { @@ -358,10 +358,10 @@ void KImportDialog::readFile( int rows ) state = S_MAYBE_NORMAL_FIELD; } break; - case S_TQUOTED_FIELD : + case S_QUOTED_FIELD : if (x == m_textquote) { field += x; - state = S_MAYBE_END_OF_TQUOTED_FIELD; + state = S_MAYBE_END_OF_QUOTED_FIELD; } else if (x == '\n') { setData(row - m_startline, column, field); field = ""; @@ -376,10 +376,10 @@ void KImportDialog::readFile( int rows ) field += x; } break; - case S_MAYBE_END_OF_TQUOTED_FIELD : + case S_MAYBE_END_OF_QUOTED_FIELD : if (x == m_textquote) { field += x; - state = S_TQUOTED_FIELD; + state = S_QUOTED_FIELD; } else if (x == mSeparator || x == '\n') { setData(row - m_startline, column, field); field = ""; @@ -391,10 +391,10 @@ void KImportDialog::readFile( int rows ) } state = S_START; } else { - state = S_END_OF_TQUOTED_FIELD; + state = S_END_OF_QUOTED_FIELD; } break; - case S_END_OF_TQUOTED_FIELD : + case S_END_OF_QUOTED_FIELD : if (x == mSeparator || x == '\n') { setData(row - m_startline, column, field); field = ""; @@ -406,13 +406,13 @@ void KImportDialog::readFile( int rows ) } state = S_START; } else { - state = S_END_OF_TQUOTED_FIELD; + state = S_END_OF_QUOTED_FIELD; } break; case S_MAYBE_NORMAL_FIELD : if (x == m_textquote) { field = ""; - state = S_TQUOTED_FIELD; + state = S_QUOTED_FIELD; } case S_NORMAL_FIELD : if (x == mSeparator || x == '\n') { diff --git a/libtdepim/krsqueezedtextlabel.h b/libtdepim/krsqueezedtextlabel.h index e48f565d9..97451d58b 100644 --- a/libtdepim/krsqueezedtextlabel.h +++ b/libtdepim/krsqueezedtextlabel.h @@ -18,8 +18,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KRSTQUEEZEDTEXTLABEL_H -#define KRSTQUEEZEDTEXTLABEL_H +#ifndef KRSQUEEZEDTEXTLABEL_H +#define KRSQUEEZEDTEXTLABEL_H #include #include @@ -72,4 +72,4 @@ protected: }; -#endif // KRSTQUEEZEDTEXTLABEL_H +#endif // KRSQUEEZEDTEXTLABEL_H diff --git a/libtdepim/kscoring.cpp b/libtdepim/kscoring.cpp index 3bcbd7fd4..94e8c155e 100644 --- a/libtdepim/kscoring.cpp +++ b/libtdepim/kscoring.cpp @@ -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 == "ETQUALS" ) cond = ETQUALS; + else if (t == "EQUALS" ) cond = EQUALS; 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(ETQUALS)) return ETQUALS; + else if (s == getNameForCondition(EQUALS)) return EQUALS; 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 ETQUALS: return i18n("Is Exactly the Same As"); + case EQUALS: 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(ETQUALS); + l << getNameForCondition(EQUALS); l << getNameForCondition(SMALLER); l << getNameForCondition(GREATER); return l; @@ -510,7 +510,7 @@ bool KScoringExpression::match(ScorableArticle& a) const if (!head.isEmpty()) { switch (cond) { - case ETQUALS: + case EQUALS: res = (head.lower() == expr_str.lower()); break; case CONTAINS: @@ -569,7 +569,7 @@ TQString KScoringExpression::getTypeString(int cond) case CONTAINS: return "CONTAINS"; case MATCH: return "MATCH"; case MATCHCS: return "MATCHCS"; - case ETQUALS: return "ETQUALS"; + case EQUALS: return "EQUALS"; case SMALLER: return "SMALLER"; case GREATER: return "GREATER"; default: diff --git a/libtdepim/kscoring.h b/libtdepim/kscoring.h index 7225eb93f..1b6e2d3c7 100644 --- a/libtdepim/kscoring.h +++ b/libtdepim/kscoring.h @@ -186,7 +186,7 @@ class KDE_EXPORT KScoringExpression { friend class KScoringRule; public: - enum Condition { CONTAINS, MATCH, ETQUALS, SMALLER, GREATER, MATCHCS }; + enum Condition { CONTAINS, MATCH, EQUALS, SMALLER, GREATER, MATCHCS }; KScoringExpression(const TQString&,const TQString&,const TQString&, const TQString&); ~KScoringExpression(); -- cgit v1.2.1