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 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'ktouch/src/ktouch.cpp') 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; } -- cgit v1.2.1