From 24c5cdc2737fe0044b11a12359606973eb93fc0b 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/kdegames@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kgoldrunner/src/kgoldrunner.cpp | 4 ++-- kgoldrunner/src/kgrdialog.cpp | 2 +- kgoldrunner/src/kgrgame.cpp | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'kgoldrunner') diff --git a/kgoldrunner/src/kgoldrunner.cpp b/kgoldrunner/src/kgoldrunner.cpp index 7d5676c5..64dc6269 100644 --- a/kgoldrunner/src/kgoldrunner.cpp +++ b/kgoldrunner/src/kgoldrunner.cpp @@ -522,7 +522,7 @@ void KGoldrunner::initStatusBar() // Set the PAUSE/RESUME key-names into the status bar message. pauseKeys = myPause->shortcut().toString(); - pauseKeys = pauseKeys.tqreplace (';', "\" " + i18n("or") + " \""); + pauseKeys = pauseKeys.replace (';', "\" " + i18n("or") + " \""); gameFreeze (FALSE); statusBar()->setItemFixed (ID_LIVES, -1); // Fix current sizes. @@ -760,7 +760,7 @@ void KGoldrunner::optionsConfigureKeys() // Update the PAUSE/RESUME message in the status bar. pauseKeys = myPause->shortcut().toString(); - pauseKeys = pauseKeys.tqreplace (';', "\" " + i18n("or") + " \""); + pauseKeys = pauseKeys.replace (';', "\" " + i18n("or") + " \""); gameFreeze (KGrObject::frozen); // Refresh the status bar text. } diff --git a/kgoldrunner/src/kgrdialog.cpp b/kgoldrunner/src/kgrdialog.cpp index 011f56dc..ac6c5ce4 100644 --- a/kgoldrunner/src/kgrdialog.cpp +++ b/kgoldrunner/src/kgrdialog.cpp @@ -825,7 +825,7 @@ KGrLGDialog::KGrLGDialog (TQFile * savedGames, // Read the saved games into the list box. while (! gameText.endData()) { s = gameText.readLine(); // Read in one saved game. - pr = s.left (s.tqfind (" ", 0, FALSE)); // Get the collection prefix. + pr = s.left (s.find (" ", 0, FALSE)); // Get the collection prefix. for (i = 0; i < imax; i++) { // Get the collection name. if (collections.at(i)->prefix == pr) { s = s.insert (0, diff --git a/kgoldrunner/src/kgrgame.cpp b/kgoldrunner/src/kgrgame.cpp index b83b35ed..930bd83f 100644 --- a/kgoldrunner/src/kgrgame.cpp +++ b/kgoldrunner/src/kgrgame.cpp @@ -876,7 +876,7 @@ void KGrGame::loadGame() // Re-load game, score and level. if (! s.isNull()) { pr = s.mid (21, 7); // Get the collection prefix. - pr = pr.left (pr.tqfind (" ", 0, FALSE)); + pr = pr.left (pr.find (" ", 0, FALSE)); for (i = 0; i < imax; i++) { // Find the collection. if (collections.at(i)->prefix == pr) { @@ -1061,7 +1061,7 @@ void KGrGame::checkHighScore() s1 >> prevDate; if ((! scoreRecorded) && (score > prevScore)) { highCount++; - // Recode the user's name as UTF-8, in case it tqcontains + // Recode the user's name as UTF-8, in case it contains // non-ASCII chars (e.g. "Kr�ger" is encoded as "Krüger"). s2 << (const char *) thisUser.utf8(); s2 << (TQ_INT16) level; @@ -1080,7 +1080,7 @@ void KGrGame::checkHighScore() delete prevDate; } if ((! scoreRecorded) && (highCount < 10)) { - // Recode the user's name as UTF-8, in case it tqcontains + // Recode the user's name as UTF-8, in case it contains // non-ASCII chars (e.g. "Kr�ger" is encoded as "Krüger"). s2 << (const char *) thisUser.utf8(); s2 << (TQ_INT16) level; @@ -1090,7 +1090,7 @@ void KGrGame::checkHighScore() high1.close(); } else { - // Recode the user's name as UTF-8, in case it tqcontains + // Recode the user's name as UTF-8, in case it contains // non-ASCII chars (e.g. "Kr�ger" is encoded as "Krüger"). s2 << (const char *) thisUser.utf8(); s2 << (TQ_INT16) level; @@ -2496,9 +2496,9 @@ bool KGrGame::loadCollections (Owner o) line = line.simplifyWhiteSpace(); int i, j, len; len = line.length(); - i = 0; j = line.tqfind(' ',i); nLevels = line.left(j).toInt(); - i = j+1; j = line.tqfind(' ',i); settings = line[i]; - i = j+1; j = line.tqfind(' ',i); prefix = line.mid(i,j-i); + i = 0; j = line.find(' ',i); nLevels = line.left(j).toInt(); + i = j+1; j = line.find(' ',i); settings = line[i]; + i = j+1; j = line.find(' ',i); prefix = line.mid(i,j-i); i = j+1; name = line.right(len-i); } // If first character is not a digit, the line should be an "about". -- cgit v1.2.1