From 7909152750670148360093b2519955fbfa555154 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 --- kspaceduel/mainview.cpp | 10 +++++----- kspaceduel/topwidget.cpp | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'kspaceduel') diff --git a/kspaceduel/mainview.cpp b/kspaceduel/mainview.cpp index a2645087..9fabcf3c 100644 --- a/kspaceduel/mainview.cpp +++ b/kspaceduel/mainview.cpp @@ -99,7 +99,7 @@ MyMainView::MyMainView(TQWidget *parent) MyMainView::~MyMainView() { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); writeConfig(); } @@ -340,7 +340,7 @@ void MyMainView::pause() pauseAction->setChecked( true ); waitForStart=true; - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); emit setStatusText(i18n(" paused "), IDS_PAUSE); } } @@ -375,7 +375,7 @@ void MyMainView::stop() pauseAction->setEnabled( false ); pauseAction->setChecked( false ); - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); waitForStart = true; } @@ -444,7 +444,7 @@ void MyMainView::newRound() timeToNextPowerup=random.getDouble() * config.powerupRefreshTime; powerups.clear(); - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); mx=width()/2.0; my=height()/2.0; ship[0]->move(mx+config.startPosX,my+config.startPosY); @@ -517,7 +517,7 @@ void MyMainView::timerEvent(TQTimerEvent *event) if(event->timerId()==timerID) { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); if(gameEnd>0.0) { gameEnd-=1.0; diff --git a/kspaceduel/topwidget.cpp b/kspaceduel/topwidget.cpp index fb385b0c..ce727607 100644 --- a/kspaceduel/topwidget.cpp +++ b/kspaceduel/topwidget.cpp @@ -34,12 +34,12 @@ void MyTopLevelWidget::initGameWidgets( ){ playfield->setFocusPolicy(TQWidget::StrongFocus); playfield->setFocus(); - TQObject::connect(TQT_TQOBJECT(playfield),TQT_SIGNAL(energy(int,int)), + TQObject::connect(playfield,TQT_SIGNAL(energy(int,int)), TQT_SLOT(energy(int,int))); - TQObject::connect(TQT_TQOBJECT(playfield),TQT_SIGNAL(hitPoints(int,int)), + TQObject::connect(playfield,TQT_SIGNAL(hitPoints(int,int)), TQT_SLOT(hitPoints(int,int))); - TQObject::connect(TQT_TQOBJECT(playfield),TQT_SIGNAL(wins(int,int)),TQT_SLOT(wins(int,int))); - TQObject::connect(TQT_TQOBJECT(playfield),TQT_SIGNAL(setStatusText(const TQString &,int)), + TQObject::connect(playfield,TQT_SIGNAL(wins(int,int)),TQT_SLOT(wins(int,int))); + TQObject::connect(playfield,TQT_SIGNAL(setStatusText(const TQString &,int)), TQT_SLOT(setStatusText(const TQString &,int))); setCentralWidget(w); @@ -62,18 +62,18 @@ void MyTopLevelWidget::wins(int pn,int w) void MyTopLevelWidget::initActions( ) { - KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - KStdGameAction::gameNew(TQT_TQOBJECT(playfield), TQT_SLOT(newGame()), actionCollection()); + KStdGameAction::quit(this, TQT_SLOT(close()), actionCollection()); + KStdGameAction::gameNew(playfield, TQT_SLOT(newGame()), actionCollection()); ( void )new TDEAction( i18n( "&New Round" ), "spnewround", - CTRL + Key_R, TQT_TQOBJECT(playfield), TQT_SLOT( newRound( ) ), + CTRL + Key_R, playfield, TQT_SLOT( newRound( ) ), actionCollection( ), "new_round" ); MyMainView::pauseAction = - KStdGameAction::pause(TQT_TQOBJECT(playfield), TQT_SLOT(togglePause()), actionCollection()); + KStdGameAction::pause(playfield, TQT_SLOT(togglePause()), actionCollection()); MyMainView::pauseAction->setChecked( false ); TDEAction* gameStart = new TDEAction( i18n( "Start" ), GAME_START_SHORTCUT, - TQT_TQOBJECT(playfield), TQT_SLOT( start( ) ), actionCollection( ), "game_start" ); + playfield, TQT_SLOT( start( ) ), actionCollection( ), "game_start" ); - KStdAction::preferences(TQT_TQOBJECT(playfield), TQT_SLOT(gameSetup()), actionCollection()); + KStdAction::preferences(playfield, TQT_SLOT(gameSetup()), actionCollection()); TDEAccel* acc = new TDEAccel(this); gameStart->plugAccel(acc); -- cgit v1.2.1