From c20f4d8f2cf03c69fcecc80d63fe3cbb80f51610 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 13 Jan 2024 12:28:49 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- kmahjongg/kmahjongg.cpp | 86 ++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'kmahjongg/kmahjongg.cpp') diff --git a/kmahjongg/kmahjongg.cpp b/kmahjongg/kmahjongg.cpp index 57f43512..629794ab 100644 --- a/kmahjongg/kmahjongg.cpp +++ b/kmahjongg/kmahjongg.cpp @@ -80,37 +80,37 @@ KMahjongg::KMahjongg( TQWidget* parent, const char *name) bDemoModeActive = false; - connect( bw, TQT_SIGNAL( statusTextChanged(const TQString&, long) ), - TQT_SLOT( showStatusText(const TQString&, long) ) ); + connect( bw, TQ_SIGNAL( statusTextChanged(const TQString&, long) ), + TQ_SLOT( showStatusText(const TQString&, long) ) ); - connect( bw, TQT_SIGNAL( tileNumberChanged(int,int,int) ), - TQT_SLOT( showTileNumber(int,int,int) ) ); + connect( bw, TQ_SIGNAL( tileNumberChanged(int,int,int) ), + TQ_SLOT( showTileNumber(int,int,int) ) ); - connect( bw, TQT_SIGNAL( demoModeChanged(bool) ), - TQT_SLOT( demoModeChanged(bool) ) ); + connect( bw, TQ_SIGNAL( demoModeChanged(bool) ), + TQ_SLOT( demoModeChanged(bool) ) ); - connect( bw, TQT_SIGNAL( gameOver(unsigned short , unsigned short)), this, - TQT_SLOT( gameOver(unsigned short , unsigned short))); + connect( bw, TQ_SIGNAL( gameOver(unsigned short , unsigned short)), this, + TQ_SLOT( gameOver(unsigned short , unsigned short))); - connect(bw, TQT_SIGNAL(gameCalculated()), - this, TQT_SLOT(timerReset())); + connect(bw, TQ_SIGNAL(gameCalculated()), + this, TQ_SLOT(timerReset())); // Make connections for the preview load dialog - connect( previewLoad, TQT_SIGNAL( boardRedraw(bool) ), - bw, TQT_SLOT( drawBoard(bool) ) ); + connect( previewLoad, TQ_SIGNAL( boardRedraw(bool) ), + bw, TQ_SLOT( drawBoard(bool) ) ); - connect( previewLoad, TQT_SIGNAL( layoutChange() ), - this, TQT_SLOT( newGame() ) ); + connect( previewLoad, TQ_SIGNAL( layoutChange() ), + this, TQ_SLOT( newGame() ) ); - connect( previewLoad, TQT_SIGNAL( loadBackground(const TQString&, bool) ), - bw, TQT_SLOT(loadBackground(const TQString&, bool) ) ); + connect( previewLoad, TQ_SIGNAL( loadBackground(const TQString&, bool) ), + bw, TQ_SLOT(loadBackground(const TQString&, bool) ) ); - connect( previewLoad, TQT_SIGNAL( loadTileset(const TQString &) ), - bw, TQT_SLOT(loadTileset(const TQString&) ) ); - connect( previewLoad, TQT_SIGNAL( loadBoard(const TQString&) ), - TQT_SLOT(loadBoardLayout(const TQString&) ) ); + connect( previewLoad, TQ_SIGNAL( loadTileset(const TQString &) ), + bw, TQ_SLOT(loadTileset(const TQString&) ) ); + connect( previewLoad, TQ_SIGNAL( loadBoard(const TQString&) ), + TQ_SLOT(loadBoardLayout(const TQString&) ) ); startNewGame( ); @@ -128,41 +128,41 @@ KMahjongg::~KMahjongg() void KMahjongg::setupTDEAction() { // game - KStdGameAction::gameNew(this, TQT_SLOT(newGame()), actionCollection()); - KStdGameAction::load(this, TQT_SLOT(loadGame()), actionCollection()); - KStdGameAction::save(this, TQT_SLOT(saveGame()), actionCollection()); - KStdGameAction::quit(this, TQT_SLOT(close()), actionCollection()); - KStdGameAction::restart(this, TQT_SLOT(restartGame()), actionCollection()); - new TDEAction(i18n("New Numbered Game..."), "newnum", 0, this, TQT_SLOT(startNewNumeric()), actionCollection(), "game_new_numeric"); - new TDEAction(i18n("Open Th&eme..."), 0, this, TQT_SLOT(openTheme()), actionCollection(), "game_open_theme"); - new TDEAction(i18n("Open &Tileset..."), 0, this, TQT_SLOT(openTileset()), actionCollection(), "game_open_tileset"); - new TDEAction(i18n("Open &Background..."), 0, this, TQT_SLOT(openBackground()), actionCollection(), "game_open_background"); - new TDEAction(i18n("Open La&yout..."), 0, this, TQT_SLOT(openLayout()), actionCollection(), "game_open_layout"); - new TDEAction(i18n("Sa&ve Theme..."), 0, this, TQT_SLOT(saveTheme()), actionCollection(), "game_save_theme"); + KStdGameAction::gameNew(this, TQ_SLOT(newGame()), actionCollection()); + KStdGameAction::load(this, TQ_SLOT(loadGame()), actionCollection()); + KStdGameAction::save(this, TQ_SLOT(saveGame()), actionCollection()); + KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection()); + KStdGameAction::restart(this, TQ_SLOT(restartGame()), actionCollection()); + new TDEAction(i18n("New Numbered Game..."), "newnum", 0, this, TQ_SLOT(startNewNumeric()), actionCollection(), "game_new_numeric"); + new TDEAction(i18n("Open Th&eme..."), 0, this, TQ_SLOT(openTheme()), actionCollection(), "game_open_theme"); + new TDEAction(i18n("Open &Tileset..."), 0, this, TQ_SLOT(openTileset()), actionCollection(), "game_open_tileset"); + new TDEAction(i18n("Open &Background..."), 0, this, TQ_SLOT(openBackground()), actionCollection(), "game_open_background"); + new TDEAction(i18n("Open La&yout..."), 0, this, TQ_SLOT(openLayout()), actionCollection(), "game_open_layout"); + new TDEAction(i18n("Sa&ve Theme..."), 0, this, TQ_SLOT(saveTheme()), actionCollection(), "game_save_theme"); // originally "file" ends here - KStdGameAction::hint(bw, TQT_SLOT(helpMove()), actionCollection()); - new TDEAction(i18n("Shu&ffle"), "reload", 0, bw, TQT_SLOT(shuffle()), actionCollection(), "move_shuffle"); - demoAction = KStdGameAction::demo(this, TQT_SLOT(demoMode()), actionCollection()); - showMatchingTilesAction = new TDEToggleAction(i18n("Show &Matching Tiles"), 0, this, TQT_SLOT(showMatchingTiles()), actionCollection(), "options_show_matching_tiles"); + KStdGameAction::hint(bw, TQ_SLOT(helpMove()), actionCollection()); + new TDEAction(i18n("Shu&ffle"), "reload", 0, bw, TQ_SLOT(shuffle()), actionCollection(), "move_shuffle"); + demoAction = KStdGameAction::demo(this, TQ_SLOT(demoMode()), actionCollection()); + showMatchingTilesAction = new TDEToggleAction(i18n("Show &Matching Tiles"), 0, this, TQ_SLOT(showMatchingTiles()), actionCollection(), "options_show_matching_tiles"); showMatchingTilesAction->setCheckedState(i18n("Hide &Matching Tiles")); showMatchingTilesAction->setChecked(Prefs::showMatchingTiles()); bw->setShowMatch( Prefs::showMatchingTiles() ); - KStdGameAction::highscores(this, TQT_SLOT(showHighscores()), actionCollection()); - pauseAction = KStdGameAction::pause(this, TQT_SLOT(pause()), actionCollection()); + KStdGameAction::highscores(this, TQ_SLOT(showHighscores()), actionCollection()); + pauseAction = KStdGameAction::pause(this, TQ_SLOT(pause()), actionCollection()); // TODO: store the background ; open on startup // TODO: same about layout // TODO: same about theme // move - undoAction = KStdGameAction::undo(this, TQT_SLOT(undo()), actionCollection()); - redoAction = KStdGameAction::redo(this, TQT_SLOT(redo()), actionCollection()); + undoAction = KStdGameAction::undo(this, TQ_SLOT(undo()), actionCollection()); + redoAction = KStdGameAction::redo(this, TQ_SLOT(redo()), actionCollection()); // edit - new TDEAction(i18n("&Board Editor"), 0, this, TQT_SLOT(slotBoardEditor()), actionCollection(), "edit_board_editor"); + new TDEAction(i18n("&Board Editor"), 0, this, TQ_SLOT(slotBoardEditor()), actionCollection(), "edit_board_editor"); // settings - KStdAction::preferences(this, TQT_SLOT(showSettings()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(showSettings()), actionCollection()); setupGUI(); } @@ -238,8 +238,8 @@ void KMahjongg::showSettings(){ TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Prefs::self(), KDialogBase::Swallow); dialog->addPage(new Settings(0, "General"), i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), bw, TQT_SLOT(loadSettings())); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(setDisplayedWidth())); + connect(dialog, TQ_SIGNAL(settingsChanged()), bw, TQ_SLOT(loadSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(setDisplayedWidth())); dialog->show(); } -- cgit v1.2.1