From 2d94efffcdf4a5322061d81e0338726cd1dcc8b4 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 28 Dec 2023 16:38:23 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro (cherry picked from commit 2d3b7fa3dcece8b8c2e7badc15ba8d413c3e8a90) --- tdepacman/keys.cpp | 14 +++++++------- tdepacman/referee.cpp | 42 +++++++++++++++++++++--------------------- tdepacman/score.cpp | 4 ++-- tdepacman/tdepacman.cpp | 42 +++++++++++++++++++++--------------------- 4 files changed, 51 insertions(+), 51 deletions(-) diff --git a/tdepacman/keys.cpp b/tdepacman/keys.cpp index 5d8d0d2..7b879b4 100644 --- a/tdepacman/keys.cpp +++ b/tdepacman/keys.cpp @@ -21,19 +21,19 @@ PKeys::PKeys( TQWidget *parent, const char *name) TQPushButton *okButton = new TQPushButton(this); okButton->setText(i18n("Ok")); okButton->setFixedSize(okButton->size()); - connect( okButton, SIGNAL(clicked()),this, SLOT(ok()) ); + connect( okButton, TQ_SIGNAL(clicked()),this, TQ_SLOT(ok()) ); okButton->move(20,210); TQPushButton *defaultButton = new TQPushButton(this); defaultButton->setText(i18n("Defaults")); defaultButton->setFixedSize(defaultButton->size()); - connect( defaultButton, SIGNAL(clicked()),this, SLOT(defaults()) ); + connect( defaultButton, TQ_SIGNAL(clicked()),this, TQ_SLOT(defaults()) ); defaultButton->move(140,210); TQPushButton *cancelButton = new TQPushButton(this); cancelButton->setText(i18n("Cancel")); cancelButton->setFixedSize(cancelButton->size()); - connect( cancelButton, SIGNAL(clicked()),this, SLOT(reject()) ); + connect( cancelButton, TQ_SIGNAL(clicked()),this, TQ_SLOT(reject()) ); cancelButton->move(260,210); TQFrame *separator = new TQFrame(this); @@ -57,28 +57,28 @@ PKeys::PKeys( TQWidget *parent, const char *name) pixPath = dirs->findResource("appdata", "pics/up.xpm"); up->setPixmap( TQPixmap(pixPath)); up->setFixedSize(up->pixmap()->size()); - connect( up, SIGNAL(clicked()),this, SLOT(butUp()) ); + connect( up, TQ_SIGNAL(clicked()),this, TQ_SLOT(butUp()) ); up->move(180, 50); TQPushButton *down = new TQPushButton(this); pixPath = dirs->findResource("appdata", "pics/down.xpm"); down->setPixmap( TQPixmap(pixPath)); down->setFixedSize(down->pixmap()->size()); - connect( down, SIGNAL(clicked()),this, SLOT(butDown()) ); + connect( down, TQ_SIGNAL(clicked()),this, TQ_SLOT(butDown()) ); down->move(180, 130); TQPushButton *left = new TQPushButton(this); pixPath = dirs->findResource("appdata", "pics/left.xpm"); left->setPixmap( TQPixmap(pixPath)); left->setFixedSize(left->pixmap()->size()); - connect( left, SIGNAL(clicked()),this, SLOT(butLeft()) ); + connect( left, TQ_SIGNAL(clicked()),this, TQ_SLOT(butLeft()) ); left->move(140, 90); TQPushButton *right = new TQPushButton(this); pixPath = dirs->findResource("appdata", "pics/right.xpm"); right->setPixmap( TQPixmap(pixPath)); right->setFixedSize(right->pixmap()->size()); - connect( right, SIGNAL(clicked()),this, SLOT(butRight()) ); + connect( right, TQ_SIGNAL(clicked()),this, TQ_SLOT(butRight()) ); right->move(220, 90); diff --git a/tdepacman/referee.cpp b/tdepacman/referee.cpp index d2f6ff1..1daec16 100644 --- a/tdepacman/referee.cpp +++ b/tdepacman/referee.cpp @@ -770,13 +770,13 @@ void Referee::eaten() pix->rect(pacman->position(), MonsterScorePix, monstersEaten-1))); if (--timerCount > 0) - TQTimer::singleShot( monsterScoreDurMS, this, SLOT(eaten())); + TQTimer::singleShot( monsterScoreDurMS, this, TQ_SLOT(eaten())); else { for (Monster *m = monsters->first(); m != 0; m = monsters->next()) if (m && m->direction() == X && !gameState.testBit(Introducing)) m->setDirection(N); if (monstersEaten != 4 || !gameState.testBit(Introducing)) - TQTimer::singleShot( monsterScoreDurMS, this, SLOT(start())); + TQTimer::singleShot( monsterScoreDurMS, this, TQ_SLOT(start())); } } @@ -918,14 +918,14 @@ void Referee::introPlay() if (!gameState.testBit(Introducing) || gameState.testBit(Ready)) return; if (gameState.testBit(Paused) || gameState.testBit(HallOfFame)) { - TQTimer::singleShot(afterPauseMS, this, SLOT(introPlay())); + TQTimer::singleShot(afterPauseMS, this, TQ_SLOT(introPlay())); return; } if (!gameState.testBit(Init)) { if (monstersEaten == 4) { stop(); - TQTimer::singleShot(introPostAnimationMS, this, SLOT(demo())); + TQTimer::singleShot(introPostAnimationMS, this, TQ_SLOT(demo())); } if (pacman->direction() == W) { int id = -1; @@ -984,7 +984,7 @@ void Referee::introPlay() } if (timerCount++ < 15) - TQTimer::singleShot(introAnimationMS, this, SLOT(introPlay())); + TQTimer::singleShot(introAnimationMS, this, TQ_SLOT(introPlay())); } void Referee::demo() @@ -993,7 +993,7 @@ void Referee::demo() return; if (gameState.testBit(Paused) || gameState.testBit(HallOfFame)) { - TQTimer::singleShot(afterPauseMS, this, SLOT(demo())); + TQTimer::singleShot(afterPauseMS, this, TQ_SLOT(demo())); return; } @@ -1020,7 +1020,7 @@ void Referee::demo() repaint(); timerCount = 0; - TQTimer::singleShot(playerDurMS, this, SLOT(start())); + TQTimer::singleShot(playerDurMS, this, TQ_SLOT(start())); } void Referee::play() @@ -1061,13 +1061,13 @@ void Referee::play() repaint(pix->rect(board->position(fruithome), i18n("READY!")), FALSE); timerCount = 0; - TQTimer::singleShot(playerDurMS, this, SLOT(ready())); + TQTimer::singleShot(playerDurMS, this, TQ_SLOT(ready())); } void Referee::ready() { if (gameState.testBit(Paused) || gameState.testBit(HallOfFame)) { - TQTimer::singleShot(afterPauseMS, this, SLOT(ready())); + TQTimer::singleShot(afterPauseMS, this, TQ_SLOT(ready())); return; } @@ -1077,7 +1077,7 @@ void Referee::ready() gameState.clearBit(Init); repaint(pix->rect(board->position(monsterhome, 0), i18n("PLAYER ONE")), FALSE); repaintFigures(); - TQTimer::singleShot(playerDurMS, this, SLOT(ready())); + TQTimer::singleShot(playerDurMS, this, TQ_SLOT(ready())); return; } @@ -1089,7 +1089,7 @@ void Referee::ready() gameState.setBit(Ready); gameState.clearBit(Init); repaint(pix->rect(board->position(fruithome), i18n("READY!")), FALSE); - TQTimer::singleShot(readyDurMS, this, SLOT(ready())); + TQTimer::singleShot(readyDurMS, this, TQ_SLOT(ready())); } } @@ -1104,7 +1104,7 @@ void Referee::levelUp() repaint(pix->rect(pacman->position(), PacmanPix)); timerCount = 0; - TQTimer::singleShot(levelUpPreAnimationMS, this, SLOT(levelUpPlay())); + TQTimer::singleShot(levelUpPreAnimationMS, this, TQ_SLOT(levelUpPlay())); } void Referee::levelUpPlay() @@ -1113,7 +1113,7 @@ void Referee::levelUpPlay() return; if (gameState.testBit(Paused) || gameState.testBit(HallOfFame)) { - TQTimer::singleShot(afterPauseMS, this, SLOT(levelUpPlay())); + TQTimer::singleShot(afterPauseMS, this, TQ_SLOT(levelUpPlay())); return; } @@ -1128,7 +1128,7 @@ void Referee::levelUpPlay() } if (timerCount++ < 2) { - TQTimer::singleShot(levelUpAnimationMS, this, SLOT(levelUpPlay())); + TQTimer::singleShot(levelUpAnimationMS, this, TQ_SLOT(levelUpPlay())); return; } @@ -1162,7 +1162,7 @@ void Referee::start() return; if (gameState.testBit(Paused) || gameState.testBit(HallOfFame)) { - TQTimer::singleShot(afterPauseMS, this, SLOT(start())); + TQTimer::singleShot(afterPauseMS, this, TQ_SLOT(start())); return; } @@ -1212,11 +1212,11 @@ void Referee::killed() for (Monster *m = monsters->first(); m != 0; m = monsters->next()) if (m) m->setDirection(X); - TQTimer::singleShot(dyingPreAnimationMS, this, SLOT(killed())); + TQTimer::singleShot(dyingPreAnimationMS, this, TQ_SLOT(killed())); } else { stop(); if (gameState.testBit(Paused) || gameState.testBit(HallOfFame)) { - TQTimer::singleShot(afterPauseMS, this, SLOT(killed())); + TQTimer::singleShot(afterPauseMS, this, TQ_SLOT(killed())); return; } @@ -1234,16 +1234,16 @@ void Referee::killedPlay() if (!gameState.testBit(Dying) || gameState.testBit(Ready)) return; if (gameState.testBit(Paused) || gameState.testBit(HallOfFame)) { - TQTimer::singleShot(afterPauseMS, this, SLOT(killedPlay())); + TQTimer::singleShot(afterPauseMS, this, TQ_SLOT(killedPlay())); return; } if (timerCount <= pix->maxPixmaps(DyingPix)) { repaint(pix->rect(pacman->position(), PacmanPix), FALSE); if (timerCount >= pix->maxPixmaps(DyingPix)-1 || timerCount == 0) - TQTimer::singleShot(dyingPostAnimationMS, this, SLOT(killedPlay())); + TQTimer::singleShot(dyingPostAnimationMS, this, TQ_SLOT(killedPlay())); else - TQTimer::singleShot(dyingAnimationMS, this, SLOT(killedPlay())); + TQTimer::singleShot(dyingAnimationMS, this, TQ_SLOT(killedPlay())); timerCount++; } else { gameState.clearBit(Dying); @@ -1256,7 +1256,7 @@ void Referee::killedPlay() repaint(pix->rect(board->position(energizer, e), EnergizerPix), FALSE); } repaint(pix->rect(board->position(fruithome), i18n("GAME OVER")), FALSE); - TQTimer::singleShot(gameOverDurMS, this, SLOT(hallOfFame())); + TQTimer::singleShot(gameOverDurMS, this, TQ_SLOT(hallOfFame())); } else { gameState.clearBit(Init); initPacman(); diff --git a/tdepacman/score.cpp b/tdepacman/score.cpp index 41f3e09..7d81ce7 100644 --- a/tdepacman/score.cpp +++ b/tdepacman/score.cpp @@ -402,7 +402,7 @@ void Score::setScore(int level, int player) // enable gameNew directly for an immediate next try emit gameFinished(); lastPlayer = -1; - TQTimer::singleShot(hallOfFameMS, this, SLOT(end())); + TQTimer::singleShot(hallOfFameMS, this, TQ_SLOT(end())); return; } @@ -514,7 +514,7 @@ void Score::setPause(bool Paused) void Score::end() { if (paused) { - TQTimer::singleShot(afterPauseMS, this, SLOT(end())); + TQTimer::singleShot(afterPauseMS, this, TQ_SLOT(end())); return; } diff --git a/tdepacman/tdepacman.cpp b/tdepacman/tdepacman.cpp index dba35ff..8ef1b70 100644 --- a/tdepacman/tdepacman.cpp +++ b/tdepacman/tdepacman.cpp @@ -47,16 +47,16 @@ TDEpacmanApp::TDEpacmanApp(TQWidget *, const char *name) : TDEMainWindow(0, name highscoresChecked = false; focusedPause = false; - connect(view->referee, SIGNAL(setScore(int, int)), view->score, SLOT(setScore(int, int))); - connect(view->referee, SIGNAL(setPoints(int)), view->score, SLOT(set(int))); - connect(view->referee, SIGNAL(setLifes(int)), view->status, SLOT(setLifes(int))); - connect(view->referee, SIGNAL(setLevel(int)), view->status, SLOT(setLevel(int))); + connect(view->referee, TQ_SIGNAL(setScore(int, int)), view->score, TQ_SLOT(setScore(int, int))); + connect(view->referee, TQ_SIGNAL(setPoints(int)), view->score, TQ_SLOT(set(int))); + connect(view->referee, TQ_SIGNAL(setLifes(int)), view->status, TQ_SLOT(setLifes(int))); + connect(view->referee, TQ_SIGNAL(setLevel(int)), view->status, TQ_SLOT(setLevel(int))); - connect(view->referee, SIGNAL(focusedGamePause()), this, SLOT(slotFocusedGamePause())); - connect(view->referee, SIGNAL(forcedGameHighscores()), this, SLOT(slotForcedGameHighscores())); + connect(view->referee, TQ_SIGNAL(focusedGamePause()), this, TQ_SLOT(slotFocusedGamePause())); + connect(view->referee, TQ_SIGNAL(forcedGameHighscores()), this, TQ_SLOT(slotForcedGameHighscores())); - connect(view->score, SIGNAL(gameHighscores()), this, SLOT(slotGameHighscores())); - connect(view->score, SIGNAL(gameFinished()), this, SLOT(slotGameFinished())); + connect(view->score, TQ_SIGNAL(gameHighscores()), this, TQ_SLOT(slotGameHighscores())); + connect(view->score, TQ_SIGNAL(gameFinished()), this, TQ_SLOT(slotGameFinished())); } TDEpacmanApp::~TDEpacmanApp() @@ -67,25 +67,25 @@ TDEpacmanApp::~TDEpacmanApp() void TDEpacmanApp::initActions() { - gameNew = KStdGameAction::gameNew(this, SLOT(slotGameNew()), actionCollection()); - gamePause = KStdGameAction::pause(this, SLOT(slotGamePause()), actionCollection()); + gameNew = KStdGameAction::gameNew(this, TQ_SLOT(slotGameNew()), actionCollection()); + gamePause = KStdGameAction::pause(this, TQ_SLOT(slotGamePause()), actionCollection()); gamePause->setAccel(Key_F3); - gameQuit = KStdGameAction::quit(this, SLOT(slotGameQuit()), actionCollection()); - gameHighscores = KStdGameAction::highscores(this, SLOT(slotGameHighscores()), actionCollection()); - showMenuBar = KStdAction::showMenubar(this, SLOT(slotShowMenuBar()), actionCollection()); - showToolBar = KStdAction::showToolbar(this, SLOT(slotShowToolBar()), actionCollection()); - showStatusBar = KStdAction::showStatusbar(this, SLOT(slotShowStatusBar()), actionCollection()); + gameQuit = KStdGameAction::quit(this, TQ_SLOT(slotGameQuit()), actionCollection()); + gameHighscores = KStdGameAction::highscores(this, TQ_SLOT(slotGameHighscores()), actionCollection()); + showMenuBar = KStdAction::showMenubar(this, TQ_SLOT(slotShowMenuBar()), actionCollection()); + showToolBar = KStdAction::showToolbar(this, TQ_SLOT(slotShowToolBar()), actionCollection()); + showStatusBar = KStdAction::showStatusbar(this, TQ_SLOT(slotShowStatusBar()), actionCollection()); showMouseCursor = new TDEToggleAction(i18n("Show Mouse&cursor"), 0, - this, SLOT(slotShowMouseCursor()), actionCollection(), + this, TQ_SLOT(slotShowMouseCursor()), actionCollection(), "options_show_mousecursor"); selectGraphicScheme = new TDEActionMenu(i18n("&Select graphic scheme"), actionCollection(), "options_select_graphic_scheme"); - KStdAction::keyBindings(this, SLOT(slotKeyBindings()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotKeyBindings()), actionCollection()); focusOutPause = new TDEToggleAction(i18n("Pause in &Background"), 0, - this, SLOT(slotFocusOutPause()), actionCollection(), + this, TQ_SLOT(slotFocusOutPause()), actionCollection(), "options_focus_out_pause"); focusInContinue = new TDEToggleAction(i18n("Continue in &Foreground"), 0, - this, SLOT(slotFocusInContinue()), actionCollection(), + this, TQ_SLOT(slotFocusInContinue()), actionCollection(), "options_focus_in_continue"); showMenuBar->setStatusText(i18n("Enables/disables the menubar")); @@ -200,7 +200,7 @@ void TDEpacmanApp::readSchemes() schemesPopup->setAutoDelete(true); modesPopup = selectGraphicScheme->popupMenu(); - connect(modesPopup, SIGNAL(activated(int)), this, SLOT(slotSchemeActivated(int))); + connect(modesPopup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSchemeActivated(int))); if (schemeCount == 0 || scheme == -1) { TQMessageBox::warning(this, i18n("Configuration Error"), @@ -218,7 +218,7 @@ void TDEpacmanApp::readSchemes() TDEPopupMenu *p = new TDEPopupMenu; p->setCheckable(true); - connect(p, SIGNAL(activated(int)), this, SLOT(slotSchemeActivated(int))); + connect(p, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSchemeActivated(int))); schemesPopup->append(p); modeID[m] = modesPopup->insertItem(description, schemesPopup->at(m)); -- cgit v1.2.1