From 4d6acadb4557b3dc9db23fe80e361f4f65289ccd Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 20 Dec 2023 22:30:18 +0900 Subject: Replace various '#define' strings - part 6 Signed-off-by: Michele Calgaro (cherry picked from commit 7909152750670148360093b2519955fbfa555154) --- kgoldrunner/src/kgoldrunner.cpp | 88 ++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 44 deletions(-) (limited to 'kgoldrunner') diff --git a/kgoldrunner/src/kgoldrunner.cpp b/kgoldrunner/src/kgoldrunner.cpp index 4362bb5d..ca98b30f 100644 --- a/kgoldrunner/src/kgoldrunner.cpp +++ b/kgoldrunner/src/kgoldrunner.cpp @@ -193,7 +193,7 @@ void KGoldrunner::setupActions() myPause = KStdGameAction:: pause ( - TQT_TQOBJECT(this), TQT_SLOT(stopStart()), actionCollection()); + this, TQT_SLOT(stopStart()), actionCollection()); myPause-> setShortcut (Key_Escape); // Alternate key. highScore = KStdGameAction:: highscores ( @@ -214,7 +214,7 @@ void KGoldrunner::setupActions() (void) KStdGameAction:: quit ( - TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + this, TQT_SLOT(close()), actionCollection()); /**************************************************************************/ /*************************** GAME EDITOR MENU **************************/ @@ -228,17 +228,17 @@ void KGoldrunner::setupActions() (void) new TDEAction ( i18n("&Create Level"), 0, - TQT_TQOBJECT(game), TQT_SLOT(createLevel()), actionCollection(), + game, TQT_SLOT(createLevel()), actionCollection(), "create"); (void) new TDEAction ( i18n("&Edit Any Level..."), 0, - TQT_TQOBJECT(game), TQT_SLOT(updateLevel()), actionCollection(), + game, TQT_SLOT(updateLevel()), actionCollection(), "edit_any"); (void) new TDEAction ( i18n("Edit &Next Level..."), 0, - TQT_TQOBJECT(game), TQT_SLOT(updateNext()), actionCollection(), + game, TQT_SLOT(updateNext()), actionCollection(), "edit_next"); // Save Edits... @@ -249,19 +249,19 @@ void KGoldrunner::setupActions() saveEdits = new TDEAction ( i18n("&Save Edits..."), 0, - TQT_TQOBJECT(game), TQT_SLOT(saveLevelFile()), actionCollection(), + game, TQT_SLOT(saveLevelFile()), actionCollection(), "save_edits"); saveEdits->setEnabled (FALSE); // Nothing to save, yet. (void) new TDEAction ( i18n("&Move Level..."), 0, - TQT_TQOBJECT(game), TQT_SLOT(moveLevelFile()), actionCollection(), + game, TQT_SLOT(moveLevelFile()), actionCollection(), "move_level"); (void) new TDEAction ( i18n("&Delete Level..."), 0, - TQT_TQOBJECT(game), + game, TQT_SLOT(deleteLevelFile()), actionCollection(), "delete_level"); @@ -272,12 +272,12 @@ void KGoldrunner::setupActions() (void) new TDEAction ( i18n("Create Game..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(createGame()), actionCollection(), + this, TQT_SLOT(createGame()), actionCollection(), "create_game"); (void) new TDEAction ( i18n("Edit Game Info..."), 0, - TQT_TQOBJECT(this), + this, TQT_SLOT(editGameInfo()), actionCollection(), "edit_game"); @@ -290,27 +290,27 @@ void KGoldrunner::setupActions() setKGoldrunner = new TDERadioAction ( "K&Goldrunner", 0, // Default Shift+G - TQT_TQOBJECT(this), TQT_SLOT(lsKGoldrunner()), actionCollection(), + this, TQT_SLOT(lsKGoldrunner()), actionCollection(), "kgoldrunner"); setAppleII = new TDERadioAction ( "&Apple II", 0, // Default Shift+A - TQT_TQOBJECT(this), TQT_SLOT(lsApple2()), actionCollection(), + this, TQT_SLOT(lsApple2()), actionCollection(), "apple_2"); setIceCave = new TDERadioAction ( i18n("&Ice Cave"), 0, // Default Shift+I - TQT_TQOBJECT(this), TQT_SLOT(lsIceCave()), actionCollection(), + this, TQT_SLOT(lsIceCave()), actionCollection(), "ice_cave"); setMidnight = new TDERadioAction ( i18n("&Midnight"), 0, // Default Shift+M - TQT_TQOBJECT(this), TQT_SLOT(lsMidnight()), actionCollection(), + this, TQT_SLOT(lsMidnight()), actionCollection(), "midnight"); setKDEKool = new TDERadioAction ( i18n("&TDE Kool"), 0, // Default Shift+K - TQT_TQOBJECT(this), TQT_SLOT(lsKDEKool()), actionCollection(), + this, TQT_SLOT(lsKDEKool()), actionCollection(), "kde_kool"); setKGoldrunner-> setExclusiveGroup ("landscapes"); @@ -331,13 +331,13 @@ void KGoldrunner::setupActions() setMouse = new TDERadioAction ( i18n("&Mouse Controls Hero"), 0, - TQT_TQOBJECT(this), + this, TQT_SLOT(setMouseMode()), actionCollection(), "mouse_mode"); setKeyboard = new TDERadioAction ( i18n("&Keyboard Controls Hero"), 0, - TQT_TQOBJECT(this), + this, TQT_SLOT(setKeyBoardMode()), actionCollection(), "keyboard_mode"); @@ -355,27 +355,27 @@ void KGoldrunner::setupActions() TDERadioAction * nSpeed = new TDERadioAction ( i18n("Normal Speed"), 0, - TQT_TQOBJECT(this), TQT_SLOT(normalSpeed()), actionCollection(), + this, TQT_SLOT(normalSpeed()), actionCollection(), "normal_speed"); TDERadioAction * bSpeed = new TDERadioAction ( i18n("Beginner Speed"), 0, - TQT_TQOBJECT(this), TQT_SLOT(beginSpeed()), actionCollection(), + this, TQT_SLOT(beginSpeed()), actionCollection(), "beginner_speed"); TDERadioAction * cSpeed = new TDERadioAction ( i18n("Champion Speed"), 0, - TQT_TQOBJECT(this), TQT_SLOT(champSpeed()), actionCollection(), + this, TQT_SLOT(champSpeed()), actionCollection(), "champion_speed"); (void) new TDEAction ( // Repeatable action. i18n("Increase Speed"), Key_Plus, - TQT_TQOBJECT(this), TQT_SLOT(incSpeed()), actionCollection(), + this, TQT_SLOT(incSpeed()), actionCollection(), "increase_speed"); (void) new TDEAction ( // Repeatable action. i18n("Decrease Speed"), Key_Minus, - TQT_TQOBJECT(this), TQT_SLOT(decSpeed()), actionCollection(), + this, TQT_SLOT(decSpeed()), actionCollection(), "decrease_speed"); nSpeed-> setExclusiveGroup ("speed"); @@ -390,12 +390,12 @@ void KGoldrunner::setupActions() tradRules = new TDERadioAction ( i18n("&Traditional Rules"), 0, - TQT_TQOBJECT(this), TQT_SLOT(setTradRules()), actionCollection(), + this, TQT_SLOT(setTradRules()), actionCollection(), "trad_rules"); kgrRules = new TDERadioAction ( i18n("K&Goldrunner Rules"), 0, - TQT_TQOBJECT(this), TQT_SLOT(setKGrRules()), actionCollection(), + this, TQT_SLOT(setKGrRules()), actionCollection(), "kgr_rules"); tradRules-> setExclusiveGroup ("rules"); @@ -409,12 +409,12 @@ void KGoldrunner::setupActions() (void) new TDEAction ( i18n("Larger Playing Area"), 0, - TQT_TQOBJECT(this), TQT_SLOT(makeLarger()), actionCollection(), + this, TQT_SLOT(makeLarger()), actionCollection(), "larger_area"); (void) new TDEAction ( i18n("Smaller Playing Area"), 0, - TQT_TQOBJECT(this), TQT_SLOT(makeSmaller()), actionCollection(), + this, TQT_SLOT(makeSmaller()), actionCollection(), "smaller_area"); // Configure Shortcuts... @@ -422,7 +422,7 @@ void KGoldrunner::setupActions() // -------------------------- KStdAction::keyBindings ( - TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), + this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); // KStdAction::configureToolbars ( // this, TQT_SLOT(optionsConfigureToolbars()), @@ -435,19 +435,19 @@ void KGoldrunner::setupActions() // Two-handed KB controls and alternate one-handed controls for the hero. (void) new TDEAction (i18n("Move Up"), Key_Up, - TQT_TQOBJECT(this), TQT_SLOT(goUp()), actionCollection(), "move_up"); + this, TQT_SLOT(goUp()), actionCollection(), "move_up"); (void) new TDEAction (i18n("Move Right"), Key_Right, - TQT_TQOBJECT(this), TQT_SLOT(goR()), actionCollection(), "move_right"); + this, TQT_SLOT(goR()), actionCollection(), "move_right"); (void) new TDEAction (i18n("Move Down"), Key_Down, - TQT_TQOBJECT(this), TQT_SLOT(goDown()), actionCollection(), "move_down"); + this, TQT_SLOT(goDown()), actionCollection(), "move_down"); (void) new TDEAction (i18n("Move Left"), Key_Left, - TQT_TQOBJECT(this), TQT_SLOT(goL()), actionCollection(), "move_left"); + this, TQT_SLOT(goL()), actionCollection(), "move_left"); (void) new TDEAction (i18n("Stop"), Key_Space, - TQT_TQOBJECT(this), TQT_SLOT(stop()), actionCollection(), "stop"); + this, TQT_SLOT(stop()), actionCollection(), "stop"); (void) new TDEAction (i18n("Dig Right"), Key_C, - TQT_TQOBJECT(this), TQT_SLOT(digR()), actionCollection(), "dig_right"); + this, TQT_SLOT(digR()), actionCollection(), "dig_right"); (void) new TDEAction (i18n("Dig Left"), Key_Z, - TQT_TQOBJECT(this), TQT_SLOT(digL()), actionCollection(), "dig_left"); + this, TQT_SLOT(digL()), actionCollection(), "dig_left"); // Alternate one-handed controls. Set up in "kgoldrunnerui.rc". @@ -1015,34 +1015,34 @@ void KGoldrunner::makeEditToolbar() editToolbar->insertSeparator(); editToolbar->insertSeparator(); - editToolbar->insertButton (freebg, (int)FREE, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), + editToolbar->insertButton (freebg, (int)FREE, TQT_SIGNAL(clicked()), this, TQT_SLOT(freeSlot()), TRUE, i18n("Empty space")); editToolbar->insertSeparator(); - editToolbar->insertButton (edherobg, (int)HERO, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), + editToolbar->insertButton (edherobg, (int)HERO, TQT_SIGNAL(clicked()), this, TQT_SLOT (edheroSlot()), TRUE, i18n("Hero")); editToolbar->insertSeparator(); - editToolbar->insertButton (edenemybg, (int)ENEMY, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), + editToolbar->insertButton (edenemybg, (int)ENEMY, TQT_SIGNAL(clicked()), this, TQT_SLOT (edenemySlot()), TRUE, i18n("Enemy")); editToolbar->insertSeparator(); - editToolbar->insertButton (brickbg, (int)BRICK, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), + editToolbar->insertButton (brickbg, (int)BRICK, TQT_SIGNAL(clicked()), this, TQT_SLOT (brickSlot()), TRUE, i18n("Brick (can dig)")); editToolbar->insertSeparator(); - editToolbar->insertButton (betonbg, (int)BETON, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), + editToolbar->insertButton (betonbg, (int)BETON, TQT_SIGNAL(clicked()), this, TQT_SLOT (betonSlot()), TRUE, i18n("Concrete (cannot dig)")); editToolbar->insertSeparator(); - editToolbar->insertButton (fbrickbg, (int)FBRICK, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), + editToolbar->insertButton (fbrickbg, (int)FBRICK, TQT_SIGNAL(clicked()), this, TQT_SLOT (fbrickSlot()), TRUE, i18n("Trap (can fall through)")); editToolbar->insertSeparator(); - editToolbar->insertButton (ladderbg, (int)LADDER, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), + editToolbar->insertButton (ladderbg, (int)LADDER, TQT_SIGNAL(clicked()), this, TQT_SLOT (ladderSlot()), TRUE, i18n("Ladder")); editToolbar->insertSeparator(); - editToolbar->insertButton (hladderbg, (int)HLADDER, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), + editToolbar->insertButton (hladderbg, (int)HLADDER, TQT_SIGNAL(clicked()), this, TQT_SLOT (hladderSlot()), TRUE, i18n("Hidden ladder")); editToolbar->insertSeparator(); - editToolbar->insertButton (polebg, (int)POLE, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), + editToolbar->insertButton (polebg, (int)POLE, TQT_SIGNAL(clicked()), this, TQT_SLOT (poleSlot()), TRUE, i18n("Pole (or bar)")); editToolbar->insertSeparator(); - editToolbar->insertButton (nuggetbg, (int)NUGGET, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), + editToolbar->insertButton (nuggetbg, (int)NUGGET, TQT_SIGNAL(clicked()), this, TQT_SLOT (nuggetSlot()), TRUE, i18n("Gold nugget")); editToolbar->setToggle ((int) FREE, TRUE); -- cgit v1.2.1