diff options
Diffstat (limited to 'scheck')
| -rw-r--r-- | scheck/scheck.cpp | 24 | ||||
| -rw-r--r-- | scheck/scheck.h | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/scheck/scheck.cpp b/scheck/scheck.cpp index 0e4aa9c2..033051b8 100644 --- a/scheck/scheck.cpp +++ b/scheck/scheck.cpp @@ -343,7 +343,7 @@ static void removeAccelerators(TQString &str) static void removeXX(TQString &str) { - str.tqreplace("xx",""); // simple but atm best working + str.replace("xx",""); // simple but atm best working } static TQString removedXX(TQString str) @@ -355,13 +355,13 @@ static TQString removedXX(TQString str) static TQString stripAccelViolations(TQString str) { - int conflict_pos = str.tqfind("(&&)"); + int conflict_pos = str.find("(&&)"); if (conflict_pos >= 0) { str = str.mid(0, conflict_pos) + str.mid(conflict_pos+4); } - int suggestion_pos = str.tqfind("(!)"); + int suggestion_pos = str.find("(!)"); if (suggestion_pos >= 0) { str = str.mid(0, suggestion_pos) + str.mid(suggestion_pos+3); @@ -373,12 +373,12 @@ static TQString stripAccelViolations(TQString str) // Must be passed a string with its accelerators removed TQString findAccelViolations(TQString str, TQValueVector<StyleGuideViolation> &violations) { - int conflict_pos = str.tqfind("(&)"); + int conflict_pos = str.find("(&)"); if (conflict_pos >= 0) str = str.mid(0, conflict_pos) + str.mid(conflict_pos+3); - int suggestion_pos = str.tqfind("(!)"); + int suggestion_pos = str.find("(!)"); if (suggestion_pos >= 0) { str = str.mid(0, suggestion_pos) + str.mid(suggestion_pos+3); @@ -399,7 +399,7 @@ TQString findAccelViolations(TQString str, TQValueVector<StyleGuideViolation> &v TQString findUntranslatedViolations(TQString str, TQValueVector<StyleGuideViolation> &violations) { - if (str.tqfind("xx")!=-1) + if (str.find("xx")!=-1) removeXX(str); else { for (unsigned int c=0; c<str.length(); c++) @@ -502,7 +502,7 @@ static TQValueVector<StyleGuideViolation> checkSentenceStyle(TQString str, Colo } // Check if it's in the explicit case word list - const char *correctWord = ExplicitCaseWords::words()->tqfind(word.lower()); + const char *correctWord = ExplicitCaseWords::words()->find(word.lower()); // Actual captialization checking if (correctWord) @@ -667,7 +667,7 @@ static TQValueVector<StyleGuideViolation> checkTitleStyle(TQString str, TitleTy TQString lower_word = word.lower(); // Check if it's in the explicit case word list - const char *correctWord = ExplicitCaseWords::words()->tqfind(lower_word); + const char *correctWord = ExplicitCaseWords::words()->find(lower_word); if ((titleType == ShortTitle) && (lower_word=="and" || lower_word=="a" || lower_word=="an" || lower_word=="the")) { @@ -686,7 +686,7 @@ static TQValueVector<StyleGuideViolation> checkTitleStyle(TQString str, TitleTy violations.push_back(c + x); } } - else if (c && !lastWord && LowerCaseWords::words()->tqfind(word.lower())) + else if (c && !lastWord && LowerCaseWords::words()->find(word.lower())) { // We're a lowercase word if (str[c].category() == TQChar::Letter_Uppercase) @@ -2050,7 +2050,7 @@ void StyleCheckStyle::tqdrawControl( ControlElement element, // Does the menu item have a text label? if ( !s.isNull() ) { - int t = s.tqfind( '\t' ); + int t = s.find( '\t' ); int m = itemVMargin; int text_flags = AlignVCenter | ShowPrefix | DontClip | SingleLine; text_flags |= reverse ? AlignRight : AlignLeft; @@ -2547,7 +2547,7 @@ TQSize StyleCheckStyle::sizeFromContents( ContentsType contents, 2 * itemFrame ); } - if ( ! mi->text().isNull() && mi->text().tqfind('\t') >= 0 ) + if ( ! mi->text().isNull() && mi->text().find('\t') >= 0 ) w += 12; else if ( mi->popup() ) w += 2 * arrowHMargin; @@ -2759,4 +2759,4 @@ void StyleCheckStyle::renderGradient( TQPainter* p, const TQRect& r, } // vim: set noet ts=4 sw=4: -// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/scheck/scheck.h b/scheck/scheck.h index 7f4e341f..6a68063d 100644 --- a/scheck/scheck.h +++ b/scheck/scheck.h @@ -170,6 +170,6 @@ class StyleCheckStyle : public KStyle }; // vim: set noet ts=4 sw=4: -// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; #endif |