diff options
Diffstat (limited to 'kgoldrunner/src')
| -rw-r--r-- | kgoldrunner/src/data_messages.cpp | 14 | ||||
| -rw-r--r-- | kgoldrunner/src/kgoldrunner.cpp | 192 | ||||
| -rw-r--r-- | kgoldrunner/src/kgoldrunner.h | 2 | ||||
| -rw-r--r-- | kgoldrunner/src/kgrcanvas.h | 2 | ||||
| -rw-r--r-- | kgoldrunner/src/kgrdialog.cpp | 54 | ||||
| -rw-r--r-- | kgoldrunner/src/kgrdialog.h | 8 | ||||
| -rw-r--r-- | kgoldrunner/src/kgrfigure.cpp | 10 | ||||
| -rw-r--r-- | kgoldrunner/src/kgrfigure.h | 6 | ||||
| -rw-r--r-- | kgoldrunner/src/kgrgame.cpp | 50 | ||||
| -rw-r--r-- | kgoldrunner/src/kgrgame.h | 2 | ||||
| -rw-r--r-- | kgoldrunner/src/kgrobject.cpp | 2 | ||||
| -rw-r--r-- | kgoldrunner/src/kgrobject.h | 10 |
12 files changed, 176 insertions, 176 deletions
diff --git a/kgoldrunner/src/data_messages.cpp b/kgoldrunner/src/data_messages.cpp index f905168b..4c456077 100644 --- a/kgoldrunner/src/data_messages.cpp +++ b/kgoldrunner/src/data_messages.cpp @@ -29,19 +29,19 @@ i18n("TRANSLATORS: Please see the notes in the data_messages.cpp file."); i18n("Hi !!"); i18n("Hi ! Welcome to KGoldrunner ! The idea of the game is to pick up all the gold nuggets, then climb to the top of the playing area and move up to the next level. A hidden ladder will appear as you collect the last nugget." "\n" -"\nThe hero (the green figure) is your deputy. To collect the nuggets, just point the mouse where you want him to go. At first gravity takes over and he falls ..." +"\nThe hero (the green figure) is your deputy. To collect the nuggets, just point the mouse where you want the hero to go. At first gravity takes over and the hero falls ..." ); // From levels/tute002.grl (in levels.tar). i18n("Navigation"); -i18n("This is an exercise in moving around. Follow the track of gold nuggets until the ladder pops up at the right. The hero can only follow the mouse along simple paths (like _ | L or U), so be careful not to get too far ahead of him." +i18n("This is an exercise in moving around. Follow the track of gold nuggets until the ladder pops up at the right. The hero can only follow the mouse along simple paths (like _ | L or U), so be careful not to get too far ahead of them." "\n" "\nDANGER: Try not to fall off the ladder or bar into the concrete pit at the bottom right. If you do get trapped there, the only way out is to kill the hero (press key Q for quit) and start the level again." ); // From levels/tute003.grl (in levels.tar). i18n("Digging"); -i18n("Now you have to dig to get the gold! Just use the left and right mouse buttons to dig left or right of the hero's position. The hero can then jump into and through the hole he has dug. He can also dig several holes in a row and run sideways through the dug holes. Be careful though. After a while the holes close up and you can get trapped and killed." +i18n("Now you have to dig to get the gold! Just use the left and right mouse buttons to dig left or right of the hero's position. The hero can then jump into and through the hole they have dug. They can also dig several holes in a row and run sideways through the dug holes. Be careful though. After a while the holes close up and you can get trapped and killed." "\n" "\nIn the third box down, you have to dig two holes, jump in and quickly dig one more, to get through two layers. On the right, you have to dig three, then two then one to get through. There are also two little puzzles to work out along the way. Good luck!" "\n" @@ -54,9 +54,9 @@ i18n("Well, it's been nice and easy up to now, but the game would be no fun with "\n" "\nYou can handle enemies by running away, digging a hole or luring them into part of the playing area where they get stranded." "\n" -"\nIf an enemy falls into a hole, he gives up any gold he is carrying, then gets stuck in the hole for a time and climbs out. If the hole closes while he is in it, he dies and reappears somewhere else on the screen. You can deliberately kill enemies by digging several holes in a row." +"\nIf an enemy falls into a hole, they give up any gold they are carrying, then get stuck in the hole for a time and climb out. If the hole closes while they are in it, they die and reappear somewhere else on the screen. You can deliberately kill enemies by digging several holes in a row." "\n" -"\nMore importantly, you can run over an enemy's head. You must do that right at the start of this level. Dig a hole, trap the enemy, wait for him to fall all the way in, then run over him, with the other enemy in hot pursuit..." +"\nMore importantly, you can run over an enemy's head. You must do that right at the start of this level. Dig a hole, trap the enemy, wait for them to fall all the way in, then run over them, with the other enemy in hot pursuit..." ); // From levels/tute005.grl (in levels.tar). @@ -82,7 +82,7 @@ i18n("This is just a nice easy level to finish up with. Have fun with the other i18n("Bars and Ladders"); i18n("There's nowhere to dig, so you must dodge the enemies and avoid falling to the concrete at the wrong time. Try to keep the enemies together." "\n" -"\nIf an enemy has a gold outline, he is holding a nugget. He might drop it as he runs over the concrete or maybe at the top of a ladder ...... patience, patience !!" +"\nIf an enemy has a gold outline, they are holding a nugget. They might drop it as they run over the concrete or maybe at the top of a ladder ...... patience, patience !!" ); // From levels/tutea002.grl (in levels.tar). @@ -96,7 +96,7 @@ i18n("You cannot get up to the gold, so you must get the enemies to bring it dow i18n("... Or not to kill?"); i18n("It is best not to kill the enemy. Try it and you will find out why ... Heh, heh, heh !! ... ;-)" "\n" -"\nIf you do kill him unintentionally, before you have collected the gold at the top left, you can still finish the level by digging away the side of the pit he is in." +"\nIf you do kill them unintentionally, before you have collected the gold at the top left, you can still finish the level by digging away the side of the pit they are in." ); // From levels/tutea004.grl (in levels.tar). diff --git a/kgoldrunner/src/kgoldrunner.cpp b/kgoldrunner/src/kgoldrunner.cpp index 4362bb5d..8d417c8d 100644 --- a/kgoldrunner/src/kgoldrunner.cpp +++ b/kgoldrunner/src/kgoldrunner.cpp @@ -88,10 +88,10 @@ KGoldrunner::KGoldrunner() initStatusBar(); // Connect the game actions to the menu and toolbar displays. - connect(game, TQT_SIGNAL (setEditMenu (bool)), TQT_SLOT (setEditMenu (bool))); - connect(game, TQT_SIGNAL (markRuleType (char)), TQT_SLOT (markRuleType (char))); - connect(game, TQT_SIGNAL (hintAvailable(bool)), TQT_SLOT (adjustHintAction(bool))); - connect(game, TQT_SIGNAL (defaultEditObj()), TQT_SLOT (defaultEditObj())); + connect(game, TQ_SIGNAL (setEditMenu (bool)), TQ_SLOT (setEditMenu (bool))); + connect(game, TQ_SIGNAL (markRuleType (char)), TQ_SLOT (markRuleType (char))); + connect(game, TQ_SIGNAL (hintAvailable(bool)), TQ_SLOT (adjustHintAction(bool))); + connect(game, TQ_SIGNAL (defaultEditObj()), TQ_SLOT (defaultEditObj())); // Apply the saved mainwindow settings, if any, and ask the mainwindow // to automatically save settings if changed: window size, toolbar @@ -157,22 +157,22 @@ void KGoldrunner::setupActions() TDEAction * newAction = KStdGameAction:: gameNew ( game, - TQT_SLOT(startLevelOne()), actionCollection()); + TQ_SLOT(startLevelOne()), actionCollection()); newAction-> setText (i18n("&New Game...")); TDEAction * loadGame = KStdGameAction:: load ( - game, TQT_SLOT(loadGame()), actionCollection()); + game, TQ_SLOT(loadGame()), actionCollection()); loadGame-> setText (i18n("&Load Saved Game...")); (void) new TDEAction ( i18n("&Play Any Level..."), 0, - game, TQT_SLOT(startAnyLevel()), actionCollection(), + game, TQ_SLOT(startAnyLevel()), actionCollection(), "play_any"); (void) new TDEAction ( i18n("Play &Next Level..."), 0, game, - TQT_SLOT(startNextLevel()), actionCollection(), + TQ_SLOT(startNextLevel()), actionCollection(), "play_next"); // Save Game... @@ -181,7 +181,7 @@ void KGoldrunner::setupActions() saveGame = KStdGameAction:: save ( - game, TQT_SLOT(saveGame()), actionCollection()); + game, TQ_SLOT(saveGame()), actionCollection()); saveGame-> setText (i18n("&Save Game...")); saveGame-> setShortcut (Key_S); // Alternate key. @@ -193,20 +193,20 @@ void KGoldrunner::setupActions() myPause = KStdGameAction:: pause ( - TQT_TQOBJECT(this), TQT_SLOT(stopStart()), actionCollection()); + this, TQ_SLOT(stopStart()), actionCollection()); myPause-> setShortcut (Key_Escape); // Alternate key. highScore = KStdGameAction:: highscores ( - game, TQT_SLOT(showHighScores()), actionCollection()); + game, TQ_SLOT(showHighScores()), actionCollection()); hintAction = new TDEAction ( i18n("&Get Hint"), "ktip", 0, - game, TQT_SLOT(showHint()), actionCollection(), + game, TQ_SLOT(showHint()), actionCollection(), "get_hint"); killHero = new TDEAction ( i18n("&Kill Hero"), Key_Q, - game, TQT_SLOT(herosDead()), actionCollection(), + game, TQ_SLOT(herosDead()), actionCollection(), "kill_hero"); // Quit @@ -214,7 +214,7 @@ void KGoldrunner::setupActions() (void) KStdGameAction:: quit ( - TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + this, TQ_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, TQ_SLOT(createLevel()), actionCollection(), "create"); (void) new TDEAction ( i18n("&Edit Any Level..."), 0, - TQT_TQOBJECT(game), TQT_SLOT(updateLevel()), actionCollection(), + game, TQ_SLOT(updateLevel()), actionCollection(), "edit_any"); (void) new TDEAction ( i18n("Edit &Next Level..."), 0, - TQT_TQOBJECT(game), TQT_SLOT(updateNext()), actionCollection(), + game, TQ_SLOT(updateNext()), actionCollection(), "edit_next"); // Save Edits... @@ -249,20 +249,20 @@ void KGoldrunner::setupActions() saveEdits = new TDEAction ( i18n("&Save Edits..."), 0, - TQT_TQOBJECT(game), TQT_SLOT(saveLevelFile()), actionCollection(), + game, TQ_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, TQ_SLOT(moveLevelFile()), actionCollection(), "move_level"); (void) new TDEAction ( i18n("&Delete Level..."), 0, - TQT_TQOBJECT(game), - TQT_SLOT(deleteLevelFile()), actionCollection(), + game, + TQ_SLOT(deleteLevelFile()), actionCollection(), "delete_level"); // Create a Game @@ -272,13 +272,13 @@ void KGoldrunner::setupActions() (void) new TDEAction ( i18n("Create Game..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(createGame()), actionCollection(), + this, TQ_SLOT(createGame()), actionCollection(), "create_game"); (void) new TDEAction ( i18n("Edit Game Info..."), 0, - TQT_TQOBJECT(this), - TQT_SLOT(editGameInfo()), actionCollection(), + this, + TQ_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, TQ_SLOT(lsKGoldrunner()), actionCollection(), "kgoldrunner"); setAppleII = new TDERadioAction ( "&Apple II", 0, // Default Shift+A - TQT_TQOBJECT(this), TQT_SLOT(lsApple2()), actionCollection(), + this, TQ_SLOT(lsApple2()), actionCollection(), "apple_2"); setIceCave = new TDERadioAction ( i18n("&Ice Cave"), 0, // Default Shift+I - TQT_TQOBJECT(this), TQT_SLOT(lsIceCave()), actionCollection(), + this, TQ_SLOT(lsIceCave()), actionCollection(), "ice_cave"); setMidnight = new TDERadioAction ( i18n("&Midnight"), 0, // Default Shift+M - TQT_TQOBJECT(this), TQT_SLOT(lsMidnight()), actionCollection(), + this, TQ_SLOT(lsMidnight()), actionCollection(), "midnight"); setKDEKool = new TDERadioAction ( i18n("&TDE Kool"), 0, // Default Shift+K - TQT_TQOBJECT(this), TQT_SLOT(lsKDEKool()), actionCollection(), + this, TQ_SLOT(lsKDEKool()), actionCollection(), "kde_kool"); setKGoldrunner-> setExclusiveGroup ("landscapes"); @@ -331,14 +331,14 @@ void KGoldrunner::setupActions() setMouse = new TDERadioAction ( i18n("&Mouse Controls Hero"), 0, - TQT_TQOBJECT(this), - TQT_SLOT(setMouseMode()), actionCollection(), + this, + TQ_SLOT(setMouseMode()), actionCollection(), "mouse_mode"); setKeyboard = new TDERadioAction ( i18n("&Keyboard Controls Hero"), 0, - TQT_TQOBJECT(this), - TQT_SLOT(setKeyBoardMode()), actionCollection(), + this, + TQ_SLOT(setKeyBoardMode()), actionCollection(), "keyboard_mode"); setMouse-> setExclusiveGroup ("control"); @@ -355,27 +355,27 @@ void KGoldrunner::setupActions() TDERadioAction * nSpeed = new TDERadioAction ( i18n("Normal Speed"), 0, - TQT_TQOBJECT(this), TQT_SLOT(normalSpeed()), actionCollection(), + this, TQ_SLOT(normalSpeed()), actionCollection(), "normal_speed"); TDERadioAction * bSpeed = new TDERadioAction ( i18n("Beginner Speed"), 0, - TQT_TQOBJECT(this), TQT_SLOT(beginSpeed()), actionCollection(), + this, TQ_SLOT(beginSpeed()), actionCollection(), "beginner_speed"); TDERadioAction * cSpeed = new TDERadioAction ( i18n("Champion Speed"), 0, - TQT_TQOBJECT(this), TQT_SLOT(champSpeed()), actionCollection(), + this, TQ_SLOT(champSpeed()), actionCollection(), "champion_speed"); (void) new TDEAction ( // Repeatable action. i18n("Increase Speed"), Key_Plus, - TQT_TQOBJECT(this), TQT_SLOT(incSpeed()), actionCollection(), + this, TQ_SLOT(incSpeed()), actionCollection(), "increase_speed"); (void) new TDEAction ( // Repeatable action. i18n("Decrease Speed"), Key_Minus, - TQT_TQOBJECT(this), TQT_SLOT(decSpeed()), actionCollection(), + this, TQ_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, TQ_SLOT(setTradRules()), actionCollection(), "trad_rules"); kgrRules = new TDERadioAction ( i18n("K&Goldrunner Rules"), 0, - TQT_TQOBJECT(this), TQT_SLOT(setKGrRules()), actionCollection(), + this, TQ_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, TQ_SLOT(makeLarger()), actionCollection(), "larger_area"); (void) new TDEAction ( i18n("Smaller Playing Area"), 0, - TQT_TQOBJECT(this), TQT_SLOT(makeSmaller()), actionCollection(), + this, TQ_SLOT(makeSmaller()), actionCollection(), "smaller_area"); // Configure Shortcuts... @@ -422,10 +422,10 @@ void KGoldrunner::setupActions() // -------------------------- KStdAction::keyBindings ( - TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), + this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); // KStdAction::configureToolbars ( - // this, TQT_SLOT(optionsConfigureToolbars()), + // this, TQ_SLOT(optionsConfigureToolbars()), // actionCollection()); /**************************************************************************/ @@ -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, TQ_SLOT(goUp()), actionCollection(), "move_up"); (void) new TDEAction (i18n("Move Right"), Key_Right, - TQT_TQOBJECT(this), TQT_SLOT(goR()), actionCollection(), "move_right"); + this, TQ_SLOT(goR()), actionCollection(), "move_right"); (void) new TDEAction (i18n("Move Down"), Key_Down, - TQT_TQOBJECT(this), TQT_SLOT(goDown()), actionCollection(), "move_down"); + this, TQ_SLOT(goDown()), actionCollection(), "move_down"); (void) new TDEAction (i18n("Move Left"), Key_Left, - TQT_TQOBJECT(this), TQT_SLOT(goL()), actionCollection(), "move_left"); + this, TQ_SLOT(goL()), actionCollection(), "move_left"); (void) new TDEAction (i18n("Stop"), Key_Space, - TQT_TQOBJECT(this), TQT_SLOT(stop()), actionCollection(), "stop"); + this, TQ_SLOT(stop()), actionCollection(), "stop"); (void) new TDEAction (i18n("Dig Right"), Key_C, - TQT_TQOBJECT(this), TQT_SLOT(digR()), actionCollection(), "dig_right"); + this, TQ_SLOT(digR()), actionCollection(), "dig_right"); (void) new TDEAction (i18n("Dig Left"), Key_Z, - TQT_TQOBJECT(this), TQT_SLOT(digL()), actionCollection(), "dig_left"); + this, TQ_SLOT(digL()), actionCollection(), "dig_left"); // Alternate one-handed controls. Set up in "kgoldrunnerui.rc". @@ -463,31 +463,31 @@ void KGoldrunner::setupActions() // Authors' debugging aids. (void) new TDEAction (i18n("Step"), Key_Period, - game, TQT_SLOT(doStep()), actionCollection(), "do_step"); + game, TQ_SLOT(doStep()), actionCollection(), "do_step"); (void) new TDEAction (i18n("Test Bug Fix"), Key_B, - game, TQT_SLOT(bugFix()), actionCollection(), "bug_fix"); + game, TQ_SLOT(bugFix()), actionCollection(), "bug_fix"); (void) new TDEAction (i18n("Show Positions"), Key_D, - game, TQT_SLOT(showFigurePositions()), actionCollection(), "step"); + game, TQ_SLOT(showFigurePositions()), actionCollection(), "step"); (void) new TDEAction (i18n("Start Logging"), Key_G, - game, TQT_SLOT(startLogging()), actionCollection(), "logging"); + game, TQ_SLOT(startLogging()), actionCollection(), "logging"); (void) new TDEAction (i18n("Show Hero"), Key_H, - game, TQT_SLOT(showHeroState()), actionCollection(), "show_hero"); + game, TQ_SLOT(showHeroState()), actionCollection(), "show_hero"); (void) new TDEAction (i18n("Show Object"), Key_Question, - game, TQT_SLOT(showObjectState()), actionCollection(), "show_obj"); + game, TQ_SLOT(showObjectState()), actionCollection(), "show_obj"); (void) new TDEAction (i18n("Show Enemy") + "0", Key_0, - this, TQT_SLOT(showEnemy0()), actionCollection(), "show_enemy_0"); + this, TQ_SLOT(showEnemy0()), actionCollection(), "show_enemy_0"); (void) new TDEAction (i18n("Show Enemy") + "1", Key_1, - this, TQT_SLOT(showEnemy1()), actionCollection(), "show_enemy_1"); + this, TQ_SLOT(showEnemy1()), actionCollection(), "show_enemy_1"); (void) new TDEAction (i18n("Show Enemy") + "2", Key_2, - this, TQT_SLOT(showEnemy2()), actionCollection(), "show_enemy_2"); + this, TQ_SLOT(showEnemy2()), actionCollection(), "show_enemy_2"); (void) new TDEAction (i18n("Show Enemy") + "3", Key_3, - this, TQT_SLOT(showEnemy3()), actionCollection(), "show_enemy_3"); + this, TQ_SLOT(showEnemy3()), actionCollection(), "show_enemy_3"); (void) new TDEAction (i18n("Show Enemy") + "4", Key_4, - this, TQT_SLOT(showEnemy4()), actionCollection(), "show_enemy_4"); + this, TQ_SLOT(showEnemy4()), actionCollection(), "show_enemy_4"); (void) new TDEAction (i18n("Show Enemy") + "5", Key_5, - this, TQT_SLOT(showEnemy5()), actionCollection(), "show_enemy_5"); + this, TQ_SLOT(showEnemy5()), actionCollection(), "show_enemy_5"); (void) new TDEAction (i18n("Show Enemy") + "6", Key_6, - this, TQT_SLOT(showEnemy6()), actionCollection(), "show_enemy_6"); + this, TQ_SLOT(showEnemy6()), actionCollection(), "show_enemy_6"); #endif /**************************************************************************/ @@ -529,10 +529,10 @@ void KGoldrunner::initStatusBar() statusBar()->setItemFixed (ID_SCORE, -1); statusBar()->setItemFixed (ID_LEVEL, -1); - connect(game, TQT_SIGNAL (showLives (long)), TQT_SLOT (showLives (long))); - connect(game, TQT_SIGNAL (showScore (long)), TQT_SLOT (showScore (long))); - connect(game, TQT_SIGNAL (showLevel (int)), TQT_SLOT (showLevel (int))); - connect(game, TQT_SIGNAL (gameFreeze (bool)), TQT_SLOT (gameFreeze (bool))); + connect(game, TQ_SIGNAL (showLives (long)), TQ_SLOT (showLives (long))); + connect(game, TQ_SIGNAL (showScore (long)), TQ_SLOT (showScore (long))); + connect(game, TQ_SIGNAL (showLevel (int)), TQ_SLOT (showLevel (int))); + connect(game, TQ_SIGNAL (gameFreeze (bool)), TQ_SLOT (gameFreeze (bool))); } void KGoldrunner::showLives (long newLives) @@ -999,51 +999,51 @@ void KGoldrunner::makeEditToolbar() editToolbar->insertSeparator(); - editToolbar->insertButton ("document-new", 0, TQT_SIGNAL(clicked()), game, - TQT_SLOT(createLevel()), TRUE, i18n("&Create a Level")); - editToolbar->insertButton ("document-open", 1, TQT_SIGNAL(clicked()), game, - TQT_SLOT(updateLevel()), TRUE, i18n("&Edit Any Level...")); - editToolbar->insertButton ("document-save", 2, TQT_SIGNAL(clicked()), game, - TQT_SLOT(saveLevelFile()),TRUE, i18n("&Save Edits...")); + editToolbar->insertButton ("document-new", 0, TQ_SIGNAL(clicked()), game, + TQ_SLOT(createLevel()), TRUE, i18n("&Create a Level")); + editToolbar->insertButton ("document-open", 1, TQ_SIGNAL(clicked()), game, + TQ_SLOT(updateLevel()), TRUE, i18n("&Edit Any Level...")); + editToolbar->insertButton ("document-save", 2, TQ_SIGNAL(clicked()), game, + TQ_SLOT(saveLevelFile()),TRUE, i18n("&Save Edits...")); editToolbar->insertSeparator(); editToolbar->insertSeparator(); - editToolbar->insertButton ("ktip", 3, TQT_SIGNAL(clicked()), game, - TQT_SLOT(editNameAndHint()),TRUE,i18n("Edit Name/Hint")); + editToolbar->insertButton ("ktip", 3, TQ_SIGNAL(clicked()), game, + TQ_SLOT(editNameAndHint()),TRUE,i18n("Edit Name/Hint")); editToolbar->insertSeparator(); editToolbar->insertSeparator(); - editToolbar->insertButton (freebg, (int)FREE, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT(freeSlot()), TRUE, i18n("Empty space")); + editToolbar->insertButton (freebg, (int)FREE, TQ_SIGNAL(clicked()), this, + TQ_SLOT(freeSlot()), TRUE, i18n("Empty space")); editToolbar->insertSeparator(); - editToolbar->insertButton (edherobg, (int)HERO, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT (edheroSlot()), TRUE, i18n("Hero")); + editToolbar->insertButton (edherobg, (int)HERO, TQ_SIGNAL(clicked()), this, + TQ_SLOT (edheroSlot()), TRUE, i18n("Hero")); editToolbar->insertSeparator(); - editToolbar->insertButton (edenemybg, (int)ENEMY, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT (edenemySlot()), TRUE, i18n("Enemy")); + editToolbar->insertButton (edenemybg, (int)ENEMY, TQ_SIGNAL(clicked()), this, + TQ_SLOT (edenemySlot()), TRUE, i18n("Enemy")); editToolbar->insertSeparator(); - editToolbar->insertButton (brickbg, (int)BRICK, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT (brickSlot()), TRUE, i18n("Brick (can dig)")); + editToolbar->insertButton (brickbg, (int)BRICK, TQ_SIGNAL(clicked()), this, + TQ_SLOT (brickSlot()), TRUE, i18n("Brick (can dig)")); editToolbar->insertSeparator(); - editToolbar->insertButton (betonbg, (int)BETON, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT (betonSlot()), TRUE, i18n("Concrete (cannot dig)")); + editToolbar->insertButton (betonbg, (int)BETON, TQ_SIGNAL(clicked()), this, + TQ_SLOT (betonSlot()), TRUE, i18n("Concrete (cannot dig)")); editToolbar->insertSeparator(); - editToolbar->insertButton (fbrickbg, (int)FBRICK, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT (fbrickSlot()), TRUE, i18n("Trap (can fall through)")); + editToolbar->insertButton (fbrickbg, (int)FBRICK, TQ_SIGNAL(clicked()), this, + TQ_SLOT (fbrickSlot()), TRUE, i18n("Trap (can fall through)")); editToolbar->insertSeparator(); - editToolbar->insertButton (ladderbg, (int)LADDER, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT (ladderSlot()), TRUE, i18n("Ladder")); + editToolbar->insertButton (ladderbg, (int)LADDER, TQ_SIGNAL(clicked()), this, + TQ_SLOT (ladderSlot()), TRUE, i18n("Ladder")); editToolbar->insertSeparator(); - editToolbar->insertButton (hladderbg, (int)HLADDER, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT (hladderSlot()), TRUE, i18n("Hidden ladder")); + editToolbar->insertButton (hladderbg, (int)HLADDER, TQ_SIGNAL(clicked()), this, + TQ_SLOT (hladderSlot()), TRUE, i18n("Hidden ladder")); editToolbar->insertSeparator(); - editToolbar->insertButton (polebg, (int)POLE, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT (poleSlot()), TRUE, i18n("Pole (or bar)")); + editToolbar->insertButton (polebg, (int)POLE, TQ_SIGNAL(clicked()), this, + TQ_SLOT (poleSlot()), TRUE, i18n("Pole (or bar)")); editToolbar->insertSeparator(); - editToolbar->insertButton (nuggetbg, (int)NUGGET, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT (nuggetSlot()), TRUE, i18n("Gold nugget")); + editToolbar->insertButton (nuggetbg, (int)NUGGET, TQ_SIGNAL(clicked()), this, + TQ_SLOT (nuggetSlot()), TRUE, i18n("Gold nugget")); editToolbar->setToggle ((int) FREE, TRUE); editToolbar->setToggle ((int) HERO, TRUE); diff --git a/kgoldrunner/src/kgoldrunner.h b/kgoldrunner/src/kgoldrunner.h index 1b2e1437..3f6e122f 100644 --- a/kgoldrunner/src/kgoldrunner.h +++ b/kgoldrunner/src/kgoldrunner.h @@ -39,7 +39,7 @@ class KGrHero; */ class KGoldrunner : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kgoldrunner/src/kgrcanvas.h b/kgoldrunner/src/kgrcanvas.h index 884fc40e..2eaec845 100644 --- a/kgoldrunner/src/kgrcanvas.h +++ b/kgoldrunner/src/kgrcanvas.h @@ -30,7 +30,7 @@ class KGrCanvas : public TQCanvasView { - Q_OBJECT + TQ_OBJECT public: KGrCanvas (TQWidget * parent = 0, const char *name = 0); diff --git a/kgoldrunner/src/kgrdialog.cpp b/kgoldrunner/src/kgrdialog.cpp index def7af7d..4e7a8dba 100644 --- a/kgoldrunner/src/kgrdialog.cpp +++ b/kgoldrunner/src/kgrdialog.cpp @@ -99,7 +99,7 @@ KGrSLDialog::KGrSLDialog (int action, int requestedLevel, int collnIndex, // Initial range 1->150, small step 1, big step 10 and default value 1. number = new TQScrollBar (1, 150, 1, 10, 1, - Qt::Horizontal, dad); + TQt::Horizontal, dad); grid->addWidget (number, 1, 1); TQHBox * numberPair = new TQHBox (dad); @@ -213,36 +213,36 @@ KGrSLDialog::KGrSLDialog (int action, int requestedLevel, int collnIndex, slPaintLevel(); thumbNail->show(); - connect (colln, TQT_SIGNAL (highlighted (int)), this, TQT_SLOT (slColln (int))); - connect (collnA, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slAboutColln ())); + connect (colln, TQ_SIGNAL (highlighted (int)), this, TQ_SLOT (slColln (int))); + connect (collnA, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slAboutColln ())); - connect (display, TQT_SIGNAL (textChanged (const TQString &)), - this, TQT_SLOT (slUpdate (const TQString &))); + connect (display, TQ_SIGNAL (textChanged (const TQString &)), + this, TQ_SLOT (slUpdate (const TQString &))); - connect (number, TQT_SIGNAL (valueChanged(int)), this, TQT_SLOT(slShowLevel(int))); + connect (number, TQ_SIGNAL (valueChanged(int)), this, TQ_SLOT(slShowLevel(int))); // Only enable name and hint dialog here if saving a new or edited level. // At other times the name and hint have not been loaded or initialised yet. if ((slAction == SL_CREATE) || (slAction == SL_SAVE)) { - connect (levelNH, TQT_SIGNAL (clicked()), game, TQT_SLOT (editNameAndHint())); + connect (levelNH, TQ_SIGNAL (clicked()), game, TQ_SLOT (editNameAndHint())); } else { levelNH->setEnabled (FALSE); levelNH->hide(); } - connect (colln, TQT_SIGNAL (highlighted (int)), this, TQT_SLOT (slPaintLevel ())); - connect (number, TQT_SIGNAL (sliderReleased()), this, TQT_SLOT (slPaintLevel())); - connect (number, TQT_SIGNAL (nextLine()), this, TQT_SLOT (slPaintLevel())); - connect (number, TQT_SIGNAL (prevLine()), this, TQT_SLOT (slPaintLevel())); - connect (number, TQT_SIGNAL (nextPage()), this, TQT_SLOT (slPaintLevel())); - connect (number, TQT_SIGNAL (prevPage()), this, TQT_SLOT (slPaintLevel())); + connect (colln, TQ_SIGNAL (highlighted (int)), this, TQ_SLOT (slPaintLevel ())); + connect (number, TQ_SIGNAL (sliderReleased()), this, TQ_SLOT (slPaintLevel())); + connect (number, TQ_SIGNAL (nextLine()), this, TQ_SLOT (slPaintLevel())); + connect (number, TQ_SIGNAL (prevLine()), this, TQ_SLOT (slPaintLevel())); + connect (number, TQ_SIGNAL (nextPage()), this, TQ_SLOT (slPaintLevel())); + connect (number, TQ_SIGNAL (prevPage()), this, TQ_SLOT (slPaintLevel())); #ifdef KGR_PORTABLE // Set the exits from this dialog box. - connect (OK, TQT_SIGNAL (clicked ()), this, TQT_SLOT (accept ())); - connect (CANCEL, TQT_SIGNAL (clicked ()), this, TQT_SLOT (reject ())); - connect (HELP, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotHelp ())); + connect (OK, TQ_SIGNAL (clicked ()), this, TQ_SLOT (accept ())); + connect (CANCEL, TQ_SIGNAL (clicked ()), this, TQ_SLOT (reject ())); + connect (HELP, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotHelp ())); #endif } @@ -557,8 +557,8 @@ KGrNHDialog::KGrNHDialog(const TQString & levelName, const TQString & levelHint, // OK-> setAccel (Key_Return); // No! We need it in "mle" box. CANCEL-> setAccel (Key_Escape); - connect (OK, TQT_SIGNAL (clicked ()), dad, TQT_SLOT (accept ())); - connect (CANCEL, TQT_SIGNAL (clicked ()), dad, TQT_SLOT (reject ())); + connect (OK, TQ_SIGNAL (clicked ()), dad, TQ_SLOT (accept ())); + connect (CANCEL, TQ_SIGNAL (clicked ()), dad, TQ_SLOT (reject ())); #endif } @@ -612,7 +612,7 @@ KGrECDialog::KGrECDialog (int action, int collnIndex, prefixL = new TQLabel (i18n("File name prefix:"), prefixBox); ecPrefix = new TQLineEdit (prefixBox); - ecGrp = new TQButtonGroup (1, Qt::Horizontal, 0, dad); + ecGrp = new TQButtonGroup (1, TQt::Horizontal, 0, dad); mainLayout->addWidget (ecGrp); ecTradB = new TQRadioButton (i18n("Traditional rules"), ecGrp); ecKGrB = new TQRadioButton (i18n("KGoldrunner rules"), ecGrp); @@ -709,8 +709,8 @@ KGrECDialog::KGrECDialog (int action, int collnIndex, mle-> setText (""); } - connect (ecKGrB, TQT_SIGNAL (clicked ()), this, TQT_SLOT (ecSetKGr ())); - connect (ecTradB, TQT_SIGNAL (clicked ()), this, TQT_SLOT (ecSetTrad ())); + connect (ecKGrB, TQ_SIGNAL (clicked ()), this, TQ_SLOT (ecSetKGr ())); + connect (ecTradB, TQ_SIGNAL (clicked ()), this, TQ_SLOT (ecSetTrad ())); #ifdef KGR_PORTABLE OK-> setGeometry (10, 145 + mle->height(), 100, 25); @@ -721,8 +721,8 @@ KGrECDialog::KGrECDialog (int action, int collnIndex, dad-> resize (300, 175 + mle->height()); - connect (OK, TQT_SIGNAL (clicked ()), this, TQT_SLOT (accept())); - connect (CANCEL, TQT_SIGNAL (clicked ()), this, TQT_SLOT (reject())); + connect (OK, TQ_SIGNAL (clicked ()), this, TQ_SLOT (accept())); + connect (CANCEL, TQ_SIGNAL (clicked ()), this, TQ_SLOT (reject())); #endif } @@ -842,10 +842,10 @@ KGrLGDialog::KGrLGDialog (TQFile * savedGames, lgList-> setSelected (0, TRUE); lgHighlight = 0; - connect (lgList, TQT_SIGNAL (highlighted (int)), this, TQT_SLOT (lgSelect (int))); + connect (lgList, TQ_SIGNAL (highlighted (int)), this, TQ_SLOT (lgSelect (int))); #ifdef KGR_PORTABLE - connect (OK, TQT_SIGNAL (clicked ()), this, TQT_SLOT (accept ())); - connect (CANCEL, TQT_SIGNAL (clicked ()), this, TQT_SLOT (reject ())); + connect (OK, TQ_SIGNAL (clicked ()), this, TQ_SLOT (accept ())); + connect (CANCEL, TQ_SIGNAL (clicked ()), this, TQ_SLOT (reject ())); #endif } @@ -963,7 +963,7 @@ void KGrMessage::wrapped (TQWidget * parent, TQString title, TQString contents) #endif OK-> setAccel (Key_Return); - connect (OK, TQT_SIGNAL (clicked ()), mm, TQT_SLOT (accept ())); + connect (OK, TQ_SIGNAL (clicked ()), mm, TQ_SLOT (accept ())); mm-> exec (); diff --git a/kgoldrunner/src/kgrdialog.h b/kgoldrunner/src/kgrdialog.h index a3514a1e..9012e62d 100644 --- a/kgoldrunner/src/kgrdialog.h +++ b/kgoldrunner/src/kgrdialog.h @@ -57,7 +57,7 @@ class KGrThumbNail; class KGrSLDialog : public KGR_DIALOG // KGR_PORTABLE sets TQDialog/KDialogBase { -Q_OBJECT +TQ_OBJECT public: KGrSLDialog (int action, int requestedLevel, int collnIndex, @@ -113,7 +113,7 @@ private: class KGrNHDialog : public KGR_DIALOG // KGR_PORTABLE sets TQDialog/KDialogBase { -Q_OBJECT +TQ_OBJECT public: KGrNHDialog (const TQString & levelName, const TQString & levelHint, @@ -138,7 +138,7 @@ private: class KGrECDialog : public KGR_DIALOG // KGR_PORTABLE sets TQDialog/KDialogBase { -Q_OBJECT +TQ_OBJECT public: KGrECDialog (int action, int collnIndex, @@ -191,7 +191,7 @@ private: class KGrLGDialog : public KGR_DIALOG // KGR_PORTABLE sets TQDialog/KDialogBase { -Q_OBJECT +TQ_OBJECT public: KGrLGDialog (TQFile * savedGames, TQPtrList<KGrCollection> & collections, diff --git a/kgoldrunner/src/kgrfigure.cpp b/kgoldrunner/src/kgrfigure.cpp index 850de749..0707da67 100644 --- a/kgoldrunner/src/kgrfigure.cpp +++ b/kgoldrunner/src/kgrfigure.cpp @@ -310,8 +310,8 @@ KGrHero :: KGrHero (KGrCanvas * view, int x, int y) walkFrozen = FALSE; fallFrozen = FALSE; - connect (walkTimer, TQT_SIGNAL (timeout ()), TQT_SLOT (walkTimeDone ())); - connect (fallTimer, TQT_SIGNAL (timeout ()), TQT_SLOT (fallTimeDone ())); + connect (walkTimer, TQ_SIGNAL (timeout ()), TQ_SLOT (walkTimeDone ())); + connect (fallTimer, TQ_SIGNAL (timeout ()), TQ_SLOT (fallTimeDone ())); } int KGrHero::WALKDELAY = 0; @@ -817,9 +817,9 @@ KGrEnemy :: KGrEnemy (KGrCanvas * view, int x, int y) captiveFrozen = FALSE; captiveTimer = new TQTimer (this); - connect (captiveTimer,TQT_SIGNAL(timeout()),TQT_SLOT(captiveTimeDone())); - connect (walkTimer, TQT_SIGNAL (timeout ()), TQT_SLOT (walkTimeDone ())); - connect (fallTimer, TQT_SIGNAL (timeout ()), TQT_SLOT (fallTimeDone ())); + connect (captiveTimer,TQ_SIGNAL(timeout()),TQ_SLOT(captiveTimeDone())); + connect (walkTimer, TQ_SIGNAL (timeout ()), TQ_SLOT (walkTimeDone ())); + connect (fallTimer, TQ_SIGNAL (timeout ()), TQ_SLOT (fallTimeDone ())); } int KGrEnemy::WALKDELAY = 0; diff --git a/kgoldrunner/src/kgrfigure.h b/kgoldrunner/src/kgrfigure.h index 2494d9f1..3bbfd3fb 100644 --- a/kgoldrunner/src/kgrfigure.h +++ b/kgoldrunner/src/kgrfigure.h @@ -31,7 +31,7 @@ class KGrEnemy; class KGrFigure : public TQObject { - Q_OBJECT + TQ_OBJECT public: KGrFigure (int, int); @@ -98,7 +98,7 @@ protected: class KGrHero : public KGrFigure { - Q_OBJECT + TQ_OBJECT public: KGrHero(KGrCanvas *, int , int); @@ -158,7 +158,7 @@ signals: class KGrEnemy : public KGrFigure { - Q_OBJECT + TQ_OBJECT public: KGrEnemy (KGrCanvas *, int , int); diff --git a/kgoldrunner/src/kgrgame.cpp b/kgoldrunner/src/kgrgame.cpp index ffe0987d..080f55e6 100644 --- a/kgoldrunner/src/kgrgame.cpp +++ b/kgoldrunner/src/kgrgame.cpp @@ -63,17 +63,17 @@ KGrGame::KGrGame (KGrCanvas * theView, TQString theSystemDir, TQString theUserDi modalFreeze = FALSE; messageFreeze = FALSE; - connect (hero, TQT_SIGNAL (gotNugget(int)), TQT_SLOT (incScore(int))); - connect (hero, TQT_SIGNAL (caughtHero()), TQT_SLOT (herosDead())); - connect (hero, TQT_SIGNAL (haveAllNuggets()), TQT_SLOT (showHiddenLadders())); - connect (hero, TQT_SIGNAL (leaveLevel()), TQT_SLOT (goUpOneLevel())); + connect (hero, TQ_SIGNAL (gotNugget(int)), TQ_SLOT (incScore(int))); + connect (hero, TQ_SIGNAL (caughtHero()), TQ_SLOT (herosDead())); + connect (hero, TQ_SIGNAL (haveAllNuggets()), TQ_SLOT (showHiddenLadders())); + connect (hero, TQ_SIGNAL (leaveLevel()), TQ_SLOT (goUpOneLevel())); dyingTimer = new TQTimer (this); - connect (dyingTimer, TQT_SIGNAL (timeout()), TQT_SLOT (finalBreath())); + connect (dyingTimer, TQ_SIGNAL (timeout()), TQ_SLOT (finalBreath())); // Get the mouse position every 40 msec. It is used to steer the hero. mouseSampler = new TQTimer (this); - connect (mouseSampler, TQT_SIGNAL(timeout()), TQT_SLOT (readMousePos ())); + connect (mouseSampler, TQ_SIGNAL(timeout()), TQ_SLOT (readMousePos ())); mouseSampler->start (40, FALSE); srand(1); // initialisiere Random-Generator @@ -456,8 +456,8 @@ int KGrGame::loadLevel (int levelNo) levelHint = i18n((const char *) levelHintC.left(len-1)); // Disconnect edit-mode slots from signals from "view". - disconnect (view, TQT_SIGNAL (mouseClick(int)), 0, 0); - disconnect (view, TQT_SIGNAL (mouseLetGo(int)), 0, 0); + disconnect (view, TQ_SIGNAL (mouseClick(int)), 0, 0); + disconnect (view, TQ_SIGNAL (mouseLetGo(int)), 0, 0); if (newLevel) { hero->setEnemyList (&enemies); @@ -491,7 +491,7 @@ int KGrGame::loadLevel (int levelNo) view->setMousePos (startI, startJ); // Connect play-mode slot to signal from "view". - connect (view, TQT_SIGNAL(mouseClick(int)), TQT_SLOT(doDig(int))); + connect (view, TQ_SIGNAL(mouseClick(int)), TQ_SLOT(doDig(int))); // Re-enable player input. loading = FALSE; @@ -554,9 +554,9 @@ void KGrGame::changeObject (unsigned char kind, int i, int j) enemy->setPlayfield(&playfield); enemy->enemyId = enemyCount++; enemies.append(enemy); - connect(enemy, TQT_SIGNAL(lostNugget()), TQT_SLOT(loseNugget())); - connect(enemy, TQT_SIGNAL(trapped(int)), TQT_SLOT(incScore(int))); - connect(enemy, TQT_SIGNAL(killed(int)), TQT_SLOT(incScore(int))); + connect(enemy, TQ_SIGNAL(lostNugget()), TQ_SLOT(loseNugget())); + connect(enemy, TQ_SIGNAL(trapped(int)), TQ_SLOT(incScore(int))); + connect(enemy, TQ_SIGNAL(killed(int)), TQ_SLOT(incScore(int))); } else { // Starting a level again after losing. enemy=enemies.at(enemyCount); @@ -741,8 +741,8 @@ void KGrGame::doDig (int button) { startPlaying(); // If first player-input, start playing. } switch (button) { - case Qt::LeftButton: hero->digLeft (); break; - case Qt::RightButton: hero->digRight (); break; + case TQt::LeftButton: hero->digLeft (); break; + case TQt::RightButton: hero->digRight (); break; default: break; } } @@ -1020,8 +1020,8 @@ void KGrGame::checkHighScore() OK-> setAccel (Key_Return); hsnUser-> setFocus(); // Set the keyboard input on. - connect (hsnUser, TQT_SIGNAL (returnPressed ()), hsn, TQT_SLOT (accept ())); - connect (OK, TQT_SIGNAL (clicked ()), hsn, TQT_SLOT (accept ())); + connect (hsnUser, TQ_SIGNAL (returnPressed ()), hsn, TQ_SLOT (accept ())); + connect (OK, TQ_SIGNAL (clicked ()), hsn, TQ_SLOT (accept ())); while (TRUE) { hsn->exec(); @@ -1223,7 +1223,7 @@ void KGrGame::showHighScores() hs-> move (p.x() + 50, p.y() + 50); // Start up the dialog box. - connect (OK, TQT_SIGNAL (clicked ()), hs, TQT_SLOT (accept ())); + connect (OK, TQ_SIGNAL (clicked ()), hs, TQ_SLOT (accept ())); hs-> exec(); delete hs; @@ -2030,12 +2030,12 @@ void KGrGame::setEditableCell (int i, int j, char type) void KGrGame::showEditLevel() { // Disconnect play-mode slots from signals from "view". - disconnect (view, TQT_SIGNAL(mouseClick(int)), 0, 0); - disconnect (view, TQT_SIGNAL(mouseLetGo(int)), 0, 0); + disconnect (view, TQ_SIGNAL(mouseClick(int)), 0, 0); + disconnect (view, TQ_SIGNAL(mouseLetGo(int)), 0, 0); // Connect edit-mode slots to signals from "view". - connect (view, TQT_SIGNAL(mouseClick(int)), TQT_SLOT(doEdit(int))); - connect (view, TQT_SIGNAL(mouseLetGo(int)), TQT_SLOT(endEdit(int))); + connect (view, TQ_SIGNAL(mouseClick(int)), TQ_SLOT(doEdit(int))); + connect (view, TQ_SIGNAL(mouseLetGo(int)), TQ_SLOT(endEdit(int))); } bool KGrGame::reNumberLevels (int cIndex, int first, int last, int inc) @@ -2090,8 +2090,8 @@ void KGrGame::doEdit (int button) i = p.x(); j = p.y(); switch (button) { - case Qt::LeftButton: - case Qt::RightButton: + case TQt::LeftButton: + case TQt::RightButton: paintEditObj = TRUE; insertEditObj (i, j); view->updateCanvas(); @@ -2113,8 +2113,8 @@ void KGrGame::endEdit (int button) i = p.x(); j = p.y(); switch (button) { - case Qt::LeftButton: - case Qt::RightButton: + case TQt::LeftButton: + case TQt::RightButton: paintEditObj = FALSE; if ((i != oldI) || (j != oldJ)) { insertEditObj (i, j); diff --git a/kgoldrunner/src/kgrgame.h b/kgoldrunner/src/kgrgame.h index dfc51d3e..2d6b1a57 100644 --- a/kgoldrunner/src/kgrgame.h +++ b/kgoldrunner/src/kgrgame.h @@ -45,7 +45,7 @@ class KGrCollection; class KGrGame : public TQObject { -Q_OBJECT +TQ_OBJECT public: KGrGame (KGrCanvas * theView, TQString theSystemDir, TQString theUserDir); diff --git a/kgoldrunner/src/kgrobject.cpp b/kgoldrunner/src/kgrobject.cpp index 277dbc6a..4152770b 100644 --- a/kgoldrunner/src/kgrobject.cpp +++ b/kgoldrunner/src/kgrobject.cpp @@ -106,7 +106,7 @@ KGrBrick::KGrBrick (char objType, int i, int j, KGrCanvas * view) holeFrozen = FALSE; iamA = BRICK; timer = new TQTimer (this); - connect (timer, TQT_SIGNAL (timeout ()), TQT_SLOT (timeDone ())); + connect (timer, TQ_SIGNAL (timeout ()), TQ_SLOT (timeDone ())); } void KGrBrick::dig (void) diff --git a/kgoldrunner/src/kgrobject.h b/kgoldrunner/src/kgrobject.h index 38d0a16e..2ac41b3a 100644 --- a/kgoldrunner/src/kgrobject.h +++ b/kgoldrunner/src/kgrobject.h @@ -28,7 +28,7 @@ class KGrCanvas; class KGrObject : public TQObject { - Q_OBJECT + TQ_OBJECT public: KGrObject (char objType); @@ -53,7 +53,7 @@ protected: class KGrEditable : public KGrObject { - Q_OBJECT + TQ_OBJECT public: KGrEditable (char editType); @@ -62,7 +62,7 @@ public: }; class KGrFree : public KGrObject -{ Q_OBJECT +{ TQ_OBJECT public: KGrFree (char objType, int i, int j, KGrCanvas * view); @@ -75,7 +75,7 @@ protected: class KGrBrick : public KGrObject { - Q_OBJECT + TQ_OBJECT public: KGrBrick (char objType, int i, int j, KGrCanvas * view); @@ -100,7 +100,7 @@ private: class KGrHladder : public KGrFree { - Q_OBJECT + TQ_OBJECT public: // BUG FIX - Ian W., 21/6/01 - must inherit "setNugget()" from "KGrFree". |