From 00e58f1937047eb6c23edbdb3ae7ed5feec7a572 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:55:35 -0600 Subject: Remove additional unneeded tq method conversions (cherry picked from commit c0f375feba0103bed2bac1b1f05e76e9ae28fa89) --- kgoldrunner/src/kgoldrunner.cpp | 12 +++---- kgoldrunner/src/kgrdialog.cpp | 16 ++++----- kgoldrunner/src/kgrgame.cpp | 78 ++++++++++++++++++++--------------------- kgoldrunner/src/kgrgame.h | 2 +- 4 files changed, 54 insertions(+), 54 deletions(-) (limited to 'kgoldrunner') diff --git a/kgoldrunner/src/kgoldrunner.cpp b/kgoldrunner/src/kgoldrunner.cpp index 01b9176f..42f04d03 100644 --- a/kgoldrunner/src/kgoldrunner.cpp +++ b/kgoldrunner/src/kgoldrunner.cpp @@ -572,10 +572,10 @@ void KGoldrunner::gameFreeze (bool on_off) { if (on_off) statusBar()->changeItem - (i18n("Press \"%1\" to RESUME").tqarg(pauseKeys), ID_MSG); + (i18n("Press \"%1\" to RESUME").arg(pauseKeys), ID_MSG); else statusBar()->changeItem - (i18n("Press \"%1\" to PAUSE").tqarg(pauseKeys), ID_MSG); + (i18n("Press \"%1\" to PAUSE").arg(pauseKeys), ID_MSG); } void KGoldrunner::adjustHintAction (bool hintAvailable) @@ -849,7 +849,7 @@ bool KGoldrunner::getDirectories() KGrMessage::information (this, i18n("Get Folders"), i18n("Cannot find documentation sub-folder 'en/%1/' " "in area '%2' of the KDE folder ($KDEDIRS).") - .tqarg(myDir).tqarg(dirs->kde_default ("html"))); + .arg(myDir).arg(dirs->kde_default ("html"))); // result = FALSE; // Don't abort if the doc is missing. } else @@ -861,7 +861,7 @@ bool KGoldrunner::getDirectories() KGrMessage::information (this, i18n("Get Folders"), i18n("Cannot find system games sub-folder '%1/system/' " "in area '%2' of the KDE folder ($KDEDIRS).") - .tqarg(myDir).tqarg(dirs->kde_default ("data"))); + .arg(myDir).arg(dirs->kde_default ("data"))); result = FALSE; // ABORT if the games data is missing. } else @@ -874,7 +874,7 @@ bool KGoldrunner::getDirectories() KGrMessage::information (this, i18n("Get Folders"), i18n("Cannot find or create user games sub-folder '%1/user/' " "in area '%2' of the KDE user area ($KDEHOME).") - .tqarg(myDir).tqarg(dirs->kde_default ("data"))); + .arg(myDir).arg(dirs->kde_default ("data"))); // result = FALSE; // Don't abort if user area is missing. } else { @@ -882,7 +882,7 @@ bool KGoldrunner::getDirectories() if (! create) { KGrMessage::information (this, i18n("Get Folders"), i18n("Cannot find or create 'levels/' folder in " - "sub-folder '%1/user/' in the KDE user area ($KDEHOME).").tqarg(myDir)); + "sub-folder '%1/user/' in the KDE user area ($KDEHOME).").arg(myDir)); // result = FALSE; // Don't abort if user area is missing. } } diff --git a/kgoldrunner/src/kgrdialog.cpp b/kgoldrunner/src/kgrdialog.cpp index 862889c7..4a58b235 100644 --- a/kgoldrunner/src/kgrdialog.cpp +++ b/kgoldrunner/src/kgrdialog.cpp @@ -132,7 +132,7 @@ KGrSLDialog::KGrSLDialog (int action, int requestedLevel, int collnIndex, TQPoint p = parent->mapToGlobal (TQPoint (0,0)); - // Base the tqgeometry of the dialog box on the playing area. + // Base the geometry of the dialog box on the playing area. int cell = parent->width() / (FIELDWIDTH + 4); dad-> move (p.x()+2*cell, p.y()+2*cell); dad-> setMinimumSize ((FIELDWIDTH*cell/2), (FIELDHEIGHT-1)*cell); @@ -357,7 +357,7 @@ void KGrSLDialog::slAboutColln () { // User clicked the "About" button ... int n = slCollnIndex; - TQString title = i18n("About \"%1\"").tqarg(collections.at(n)->name); + TQString title = i18n("About \"%1\"").arg(collections.at(n)->name); if (collections.at(n)->about.length() > 0) { // Convert game description to ASCII and UTF-8 codes, then translate it. @@ -404,7 +404,7 @@ void KGrSLDialog::slPaintLevel () TQString filePath = game->getFilePath (collections.at(n)->owner, collections.at(n), number->value()); thumbNail->setFilePath (filePath, slName); - thumbNail->tqrepaint(); // Will call "drawContents (p)". + thumbNail->repaint(); // Will call "drawContents (p)". } void KGrSLDialog::slotHelp () @@ -537,7 +537,7 @@ KGrNHDialog::KGrNHDialog(const TQString & levelName, const TQString & levelHint, dad-> setCaption (i18n("Edit Name & Hint")); #endif - // Base the tqgeometry of the text box on the playing area. + // Base the geometry of the text box on the playing area. TQPoint p = parent->mapToGlobal (TQPoint (0,0)); int c = parent->width() / (FIELDWIDTH + 4); dad-> move (p.x()+4*c, p.y()+4*c); @@ -642,7 +642,7 @@ KGrECDialog::KGrECDialog (int action, int collnIndex, TQPoint p = parent->mapToGlobal (TQPoint (0,0)); - // Base the tqgeometry of the dialog box on the playing area. + // Base the geometry of the dialog box on the playing area. int cell = parent->width() / (FIELDWIDTH + 4); dad-> move (p.x()+2*cell, p.y()+2*cell); dad-> setMinimumSize ((FIELDWIDTH*cell/2), (FIELDHEIGHT-1)*cell); @@ -669,7 +669,7 @@ KGrECDialog::KGrECDialog (int action, int collnIndex, collections.at(defaultGame)->nLevels)); #else nLevL-> setText (i18n("%1 levels") - .tqarg(collections.at(defaultGame)->nLevels)); + .arg(collections.at(defaultGame)->nLevels)); #endif OKText = i18n("Save Changes"); } @@ -802,7 +802,7 @@ KGrLGDialog::KGrLGDialog (TQFile * savedGames, dad-> setCaption (i18n("Select Saved Game")); - // Base the tqgeometry of the list box on the playing area. + // Base the geometry of the list box on the playing area. TQPoint p = parent->mapToGlobal (TQPoint (0,0)); int c = parent->width() / (FIELDWIDTH + 4); dad-> move (p.x()+2*c, p.y()+2*c); @@ -942,7 +942,7 @@ void KGrMessage::wrapped (TQWidget * parent, TQString title, TQString contents) mm-> setCaption (title); - // Base the tqgeometry of the text box on the playing area. + // Base the geometry of the text box on the playing area. TQPoint p = parent->mapToGlobal (TQPoint (0,0)); int c = parent->width() / (FIELDWIDTH + 4); mm-> move (p.x()+4*c, p.y()+4*c); diff --git a/kgoldrunner/src/kgrgame.cpp b/kgoldrunner/src/kgrgame.cpp index 4b0a18b8..6962d7a1 100644 --- a/kgoldrunner/src/kgrgame.cpp +++ b/kgoldrunner/src/kgrgame.cpp @@ -190,7 +190,7 @@ void KGrGame::goUpOneLevel() KGrMessage::information (view, collection->name, i18n("CONGRATULATIONS !!!!" "

You have conquered the last level in the %1 game !!

") - .tqarg("\"" + collection->name + "\"")); + .arg("\"" + collection->name + "\"")); checkHighScore(); // Check if there is a high score for this game. unfreeze(); @@ -384,7 +384,7 @@ void KGrGame::startTutorial() KGrMessage::information (view, i18n("Start Tutorial"), i18n("Cannot find the tutorial game (file-prefix %1) in " "the %2 files.") - .tqarg("'tute'").tqarg("'games.dat'")); + .arg("'tute'").arg("'games.dat'")); } } @@ -514,14 +514,14 @@ bool KGrGame::openLevelFile (int levelNo, TQFile & openlevel) KGrMessage::information (view, i18n("Load Level"), i18n("Cannot find file '%1'. Please make sure '%2' has been " "run in the '%3' folder.") - .tqarg(filePath).tqarg("tar xf levels.tar").tqarg(systemDataDir.myStr())); + .arg(filePath).arg("tar xf levels.tar").arg(systemDataDir.myStr())); return (FALSE); } // �ffne Level zum lesen if (! openlevel.open (IO_ReadOnly)) { KGrMessage::information (view, i18n("Load Level"), - i18n("Cannot open file '%1' for read-only.").tqarg(filePath)); + i18n("Cannot open file '%1' for read-only.").arg(filePath)); return (FALSE); } @@ -769,7 +769,7 @@ void KGrGame::saveGame() // Save game ID, score and level. { if (editMode) {myMessage (view, i18n("Save Game"), i18n("Sorry, you cannot save your game play while you are editing. " - "Please try menu item %1.").tqarg("\"" + i18n("&Save Edits...") + "\"")); + "Please try menu item %1.").arg("\"" + i18n("&Save Edits...") + "\"")); return; } if (hero->started) {myMessage (view, i18n("Save Game"), @@ -800,7 +800,7 @@ void KGrGame::saveGame() // Save game ID, score and level. if (! file2.open (IO_WriteOnly)) { KGrMessage::information (view, i18n("Save Game"), i18n("Cannot open file '%1' for output.") - .tqarg(userDataDir + "savegame.tmp")); + .arg(userDataDir + "savegame.tmp")); return; } TQTextStream text2 (&file2); @@ -810,7 +810,7 @@ void KGrGame::saveGame() // Save game ID, score and level. if (! file1.open (IO_ReadOnly)) { KGrMessage::information (view, i18n("Save Game"), i18n("Cannot open file '%1' for read-only.") - .tqarg(userDataDir + "savegame.dat")); + .arg(userDataDir + "savegame.dat")); return; } @@ -848,7 +848,7 @@ void KGrGame::loadGame() // Re-load game, score and level. if (! savedGames.open (IO_ReadOnly)) { KGrMessage::information (view, i18n("Load Game"), i18n("Cannot open file '%1' for read-only.") - .tqarg(userDataDir + "savegame.dat")); + .arg(userDataDir + "savegame.dat")); return; } @@ -899,7 +899,7 @@ void KGrGame::loadGame() // Re-load game, score and level. } else { KGrMessage::information (view, i18n("Load Game"), - i18n("Cannot find the game with prefix '%1'.").tqarg(pr)); + i18n("Cannot find the game with prefix '%1'.").arg(pr)); } } @@ -947,7 +947,7 @@ void KGrGame::checkHighScore() if (! high1.open (IO_ReadOnly)) { TQString high1_name = high1.name(); KGrMessage::information (view, i18n("Check for High Score"), - i18n("Cannot open file '%1' for read-only.").tqarg(high1_name)); + i18n("Cannot open file '%1' for read-only.").arg(high1_name)); return; } @@ -987,7 +987,7 @@ void KGrGame::checkHighScore() if (! high2.open (IO_WriteOnly)) { KGrMessage::information (view, i18n("Check for High Score"), i18n("Cannot open file '%1' for output.") - .tqarg(userDataDir + "hi_" + collection->prefix + ".tmp")); + .arg(userDataDir + "hi_" + collection->prefix + ".tmp")); return; } @@ -1132,7 +1132,7 @@ void KGrGame::showHighScores() if (! high1.exists()) { KGrMessage::information (view, i18n("Show High Scores"), i18n("Sorry, there are no high scores for the %1 game yet.") - .tqarg("\"" + collection->name + "\"")); + .arg("\"" + collection->name + "\"")); return; } } @@ -1140,7 +1140,7 @@ void KGrGame::showHighScores() if (! high1.open (IO_ReadOnly)) { TQString high1_name = high1.name(); KGrMessage::information (view, i18n("Show High Scores"), - i18n("Cannot open file '%1' for read-only.").tqarg(high1_name)); + i18n("Cannot open file '%1' for read-only.").arg(high1_name)); return; } @@ -1154,7 +1154,7 @@ void KGrGame::showHighScores() TQLabel * hsHeader = new TQLabel (i18n ( "

KGoldrunner Hall of Fame


" "

\"%1\" Game

") - .tqarg(collection->name), + .arg(collection->name), hs); TQLabel * hsColHeader = new TQLabel ( i18n(" Name " @@ -1584,7 +1584,7 @@ bool KGrGame::saveLevelFile() // Open the output file. if (! levelFile.open (IO_WriteOnly)) { KGrMessage::information (view, i18n("Save Level"), - i18n("Cannot open file '%1' for output.").tqarg(filePath)); + i18n("Cannot open file '%1' for output.").arg(filePath)); return (FALSE); } @@ -1642,8 +1642,8 @@ void KGrGame::moveLevelFile () KGrMessage::information (view, i18n("Move Level"), i18n("You must first load a level to be moved. Use " "the %1 or %2 menu.") - .tqarg("\"" + i18n("Game") + "\"") - .tqarg("\"" + i18n("Editor") + "\"")); + .arg("\"" + i18n("Game") + "\"") + .arg("\"" + i18n("Editor") + "\"")); return; } @@ -1780,7 +1780,7 @@ void KGrGame::deleteLevelFile () } else { KGrMessage::information (view, i18n("Delete Level"), - i18n("Cannot find file '%1' to be deleted.").tqarg(filePath)); + i18n("Cannot find file '%1' to be deleted.").arg(filePath)); return; } @@ -1883,7 +1883,7 @@ void KGrGame::editCollection (int action) if (duplicatePrefix) { KGrMessage::information (view, i18n("Save Game Info"), i18n("The filename prefix '%1' is already in use.") - .tqarg(ecPrefix)); + .arg(ecPrefix)); continue; } } @@ -2061,7 +2061,7 @@ bool KGrGame::reNumberLevels (int cIndex, int first, int last, int inc) if (! dir.rename (file1, file2, TRUE)) { // Allow absolute paths. KGrMessage::information (view, i18n("Save Level"), i18n("Cannot rename file '%1' to '%2'.") - .tqarg(file1).tqarg(file2)); + .arg(file1).arg(file2)); return (FALSE); } i = i + step; @@ -2181,8 +2181,8 @@ int KGrGame::selectLevel (int action, int requestedLevel) KGrMessage::information (view, i18n("Select Level"), i18n("There is no level %1 in %2, " "so you cannot play or edit it.") - .tqarg(selectedLevel) - .tqarg("\"" + collections.at(selectedGame)->name + "\"")); + .arg(selectedLevel) + .arg("\"" + collections.at(selectedGame)->name + "\"")); selectedLevel = 0; // Set an invalid selection. continue; // Re-run the dialog box. } @@ -2372,10 +2372,10 @@ void KGrGame::mapCollections() i18n("There is no folder '%1' to hold levels for" " the '%2' game. Please make sure '%3' " "has been run in the '%4' folder.") - .tqarg(d_path) - .tqarg(colln->name) - .tqarg("tar xf levels.tar") - .tqarg(systemDataDir)); + .arg(d_path) + .arg(colln->name) + .arg("tar xf levels.tar") + .arg(systemDataDir)); } continue; } @@ -2388,9 +2388,9 @@ void KGrGame::mapCollections() if ((files->count() <= 0) && (colln->nLevels > 0)) { KGrMessage::information (view, i18n("Check Games & Levels"), i18n("There are no files '%1/%2???.grl' for the %3 game.") - .tqarg(d_path) - .tqarg(colln->prefix) - .tqarg("\"" + colln->name + "\"")); + .arg(d_path) + .arg(colln->prefix) + .arg("\"" + colln->name + "\"")); continue; } @@ -2413,8 +2413,8 @@ void KGrGame::mapCollections() i18n("Check Games & Levels"), i18n("File '%1' is beyond the highest level for " "the %2 game and cannot be played.") - .tqarg(fileName1) - .tqarg("\"" + colln->name + "\"")); + .arg(fileName1) + .arg("\"" + colln->name + "\"")); break; } else if (fileName1 == fileName2) { @@ -2426,16 +2426,16 @@ void KGrGame::mapCollections() i18n("Check Games & Levels"), i18n("File '%1' is before the lowest level for " "the %2 game and cannot be played.") - .tqarg(fileName1) - .tqarg("\"" + colln->name + "\"")); + .arg(fileName1) + .arg("\"" + colln->name + "\"")); break; } else { KGrMessage::information (view, i18n("Check Games & Levels"), i18n("Cannot find file '%1' for the %2 game.") - .tqarg(fileName2) - .tqarg("\"" + colln->name + "\"")); + .arg(fileName2) + .arg("\"" + colln->name + "\"")); lev++; } } @@ -2457,14 +2457,14 @@ bool KGrGame::loadCollections (Owner o) if (o == SYSTEM) { KGrMessage::information (view, i18n("Load Game Info"), i18n("Cannot find game info file '%1'.") - .tqarg(filePath)); + .arg(filePath)); } return (FALSE); } if (! c.open (IO_ReadOnly)) { KGrMessage::information (view, i18n("Load Game Info"), - i18n("Cannot open file '%1' for read-only.").tqarg(filePath)); + i18n("Cannot open file '%1' for read-only.").arg(filePath)); return (FALSE); } @@ -2513,7 +2513,7 @@ bool KGrGame::loadCollections (Owner o) // Not EOF: it's an empty line or out-of-context "about" line. KGrMessage::information (view, i18n("Load Game Info"), i18n("Format error in game info file '%1'.") - .tqarg(filePath)); + .arg(filePath)); c.close(); return (FALSE); } @@ -2542,7 +2542,7 @@ bool KGrGame::saveCollections (Owner o) // Open the output file. if (! c.open (IO_WriteOnly)) { KGrMessage::information (view, i18n("Save Game Info"), - i18n("Cannot open file '%1' for output.").tqarg(filePath)); + i18n("Cannot open file '%1' for output.").arg(filePath)); return (FALSE); } diff --git a/kgoldrunner/src/kgrgame.h b/kgoldrunner/src/kgrgame.h index 2b0f26c8..a9f269c3 100644 --- a/kgoldrunner/src/kgrgame.h +++ b/kgoldrunner/src/kgrgame.h @@ -17,7 +17,7 @@ // "endData" checks for an end-of-file condition. // #define myStr latin1 -#define myChar(i) tqat((i)).latin1() +#define myChar(i) at((i)).latin1() #define endData atEnd #include -- cgit v1.2.1