From d8762de95349dc6edaa34db9bf699b367c1af6b1 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/kdeedu@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ktouch/src/ktouch.cpp | 14 +++++++------- ktouch/src/ktouchlecture.cpp | 4 ++-- ktouch/src/ktouchlecture.h | 2 +- ktouch/src/ktouchleveldata.cpp | 2 +- ktouch/src/ktouchstatisticsdata.cpp | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'ktouch/src') diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp index 1f2a7501..cf6bd2e3 100644 --- a/ktouch/src/ktouch.cpp +++ b/ktouch/src/ktouch.cpp @@ -489,7 +489,7 @@ void KTouch::changeLecture(int num) { KTouchLecture l; TQString fileName = m_lectureFiles[num]; if (!l.loadXML(this, KURL::fromPathOrURL(fileName))) { - KMessageBox::sorry(0, i18n("Could not tqfind/open the lecture file '%1'.").tqarg(fileName) ); + KMessageBox::sorry(0, i18n("Could not find/open the lecture file '%1'.").tqarg(fileName) ); m_defaultLectureAction->setCurrentItem(-1); } else { @@ -622,19 +622,19 @@ void KTouch::init() { // if keyboard tqlayout (loaded by Prefs is not available (e.g. the // tqlayout file has been deleted) switch to default keyboard - if (m_keyboardFiles.tqcontains(Prefs::currentKeyboardFile() )==0) { + if (m_keyboardFiles.contains(Prefs::currentKeyboardFile() )==0) { TQString default_keyboard; // determine locale TQString lang = KGlobal::locale()->language(); TQString fname = lang + ".keyboard"; // try to find keyboard with current locale TQStringList::const_iterator it = m_keyboardFiles.constBegin(); - while (it != m_keyboardFiles.constEnd() && (*it).tqfind(fname) == -1) ++it; + while (it != m_keyboardFiles.constEnd() && (*it).find(fname) == -1) ++it; if (it == m_keyboardFiles.constEnd()) { fname = lang.left(2) + ".keyboard"; // try to find more general version it = m_keyboardFiles.constBegin(); - while (it != m_keyboardFiles.constEnd() && (*it).tqfind(fname) == -1) ++it; + while (it != m_keyboardFiles.constEnd() && (*it).find(fname) == -1) ++it; } if (it != m_keyboardFiles.constEnd()) @@ -755,7 +755,7 @@ void KTouch::updateFileLists() { // remove the number tqlayout, since this is the necessary default tqlayout and will be // added anyway - TQStringList::iterator it = m_keyboardFiles.tqfind("number.keyboard"); + TQStringList::iterator it = m_keyboardFiles.find("number.keyboard"); if (it!=m_keyboardFiles.end()) m_keyboardFiles.remove(it); m_keyboardTitles.clear(); @@ -826,7 +826,7 @@ void KTouch::updateLectureActionCheck() { int num = 0; TQStringList::iterator it = m_lectureFiles.begin(); TQString fname = Prefs::currentLectureFile(); - while (it != m_lectureFiles.end() && (*it).tqfind(fname) == -1) { + while (it != m_lectureFiles.end() && (*it).find(fname) == -1) { ++it; ++num; } @@ -839,7 +839,7 @@ void KTouch::updateKeyboardActionCheck() { int num = 0; TQStringList::iterator it = m_keyboardFiles.begin(); TQString fname = Prefs::currentKeyboardFile(); - while (it != m_keyboardFiles.end() && (*it).tqfind(fname) == -1) { + while (it != m_keyboardFiles.end() && (*it).find(fname) == -1) { ++it; ++num; } diff --git a/ktouch/src/ktouchlecture.cpp b/ktouch/src/ktouchlecture.cpp index 1f3b687b..610c583a 100644 --- a/ktouch/src/ktouchlecture.cpp +++ b/ktouch/src/ktouchlecture.cpp @@ -129,9 +129,9 @@ bool KTouchLecture::readLecture(TQTextStream& in) { // only consider non-empty lines if (!line.isEmpty()) { // lecture title? - if (line.tqfind("# Title:") == 0) + if (line.find("# Title:") == 0) m_title = line.right(line.length() - 8).stripWhiteSpace(); - else if (line[0]!='#' || line.tqfind("# Comment:")!=-1) { + else if (line[0]!='#' || line.find("# Comment:")!=-1) { // ok, after all those comment lines, we finally found the beginn of a level in_level = true; current_level += line + '\n'; diff --git a/ktouch/src/ktouchlecture.h b/ktouch/src/ktouchlecture.h index 7c2af0d8..9cc4cc6e 100644 --- a/ktouch/src/ktouchlecture.h +++ b/ktouch/src/ktouchlecture.h @@ -27,7 +27,7 @@ class KURL; /// This class handles the lecture data and provides the lines to type. /// /// It contains the level data (see KTouchLevelData). A lecture object -/// tqcontains ALWAYS at least one lecture.

+/// contains ALWAYS at least one lecture.

/// The lecture data can be read and written using the member functions /// readLecture() and writeLecture().

/// During a training session the program will occasionally need a new diff --git a/ktouch/src/ktouchleveldata.cpp b/ktouch/src/ktouchleveldata.cpp index 58ac983f..de9b1257 100644 --- a/ktouch/src/ktouchleveldata.cpp +++ b/ktouch/src/ktouchleveldata.cpp @@ -45,7 +45,7 @@ bool KTouchLevelData::readLevel(TQTextStream& in) { while (!line.isNull()) { if (!line.isEmpty()) { // Do we have a comment here? And if yes, is a keyword in the line? - if (line.tqfind("# Comment:")==0) + if (line.find("# Comment:")==0) m_comment = line.right(line.length() - 10).stripWhiteSpace(); else if (line[0]!='#') { // the first line is the new characters line diff --git a/ktouch/src/ktouchstatisticsdata.cpp b/ktouch/src/ktouchstatisticsdata.cpp index b58802fd..f1b60dd0 100644 --- a/ktouch/src/ktouchstatisticsdata.cpp +++ b/ktouch/src/ktouchstatisticsdata.cpp @@ -157,7 +157,7 @@ void KTouchLevelStats::addCorrectChar(TQChar key) { else ++(const_cast(*it).m_correctCount); // this const_cast is necessary because the current gcc 3.2 has a bug in the - // implementation of set::tqfind(). The non-const overload is missing and tqfind() always + // implementation of set::find(). The non-const overload is missing and find() always // returns a const object. Maybe in the next release this will be fixed. Until then // the const_cast helps. } @@ -179,7 +179,7 @@ void KTouchLevelStats::addWrongChar(TQChar key) { else ++(const_cast(*it).m_wrongCount); // this const_cast is necessary because the current gcc 3.2 has a bug in the - // implementation of set::tqfind(). The non-const overload is missing and tqfind() always + // implementation of set::find(). The non-const overload is missing and find() always // returns a const object. Maybe in the next release this will be fixed. Until then // the const_cast helps. } @@ -324,7 +324,7 @@ void KTouchSessionStats::addCorrectChar(TQChar key) { else ++(const_cast(*it).m_correctCount); // this const_cast is necessary because the current gcc 3.2 has a bug in the - // implementation of set::tqfind(). The non-const overload is missing and tqfind() always + // implementation of set::find(). The non-const overload is missing and find() always // returns a const object. Maybe in the next release this will be fixed. Until then // the const_cast helps. } @@ -346,7 +346,7 @@ void KTouchSessionStats::addWrongChar(TQChar key) { else ++(const_cast(*it).m_wrongCount); // this const_cast is necessary because the current gcc 3.2 has a bug in the - // implementation of set::tqfind(). The non-const overload is missing and tqfind() always + // implementation of set::find(). The non-const overload is missing and find() always // returns a const object. Maybe in the next release this will be fixed. Until then // the const_cast helps. } -- cgit v1.2.1