summaryrefslogtreecommitdiffstats
path: root/konquest
diff options
context:
space:
mode:
Diffstat (limited to 'konquest')
-rw-r--r--konquest/int_validator.cpp4
-rw-r--r--konquest/mainwin.cpp14
2 files changed, 9 insertions, 9 deletions
diff --git a/konquest/int_validator.cpp b/konquest/int_validator.cpp
index dd96ca82..12f707c6 100644
--- a/konquest/int_validator.cpp
+++ b/konquest/int_validator.cpp
@@ -4,7 +4,7 @@
#include "int_validator.moc"
IntValidator::IntValidator( TQWidget *parent, const char *name ) :
- TQValidator( TQT_TQOBJECT(parent), name )
+ TQValidator( parent, name )
{
#ifdef INT_MIN
v_bottom = INT_MIN;
@@ -15,7 +15,7 @@ IntValidator::IntValidator( TQWidget *parent, const char *name ) :
}
IntValidator::IntValidator( int bottom, int top, TQWidget *parent, const char *name ) :
-TQValidator( TQT_TQOBJECT(parent), name )
+TQValidator( parent, name )
{
v_bottom = bottom;
v_top = top;
diff --git a/konquest/mainwin.cpp b/konquest/mainwin.cpp
index 8982974a..2131b589 100644
--- a/konquest/mainwin.cpp
+++ b/konquest/mainwin.cpp
@@ -37,18 +37,18 @@ MainWindow::~MainWindow()
void
MainWindow::setupTDEAction()
{
- KStdGameAction::gameNew( TQT_TQOBJECT(gameBoard), TQT_SLOT( startNewGame() ), actionCollection() );
- KStdGameAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
- endAction = KStdGameAction::end( TQT_TQOBJECT(gameBoard), TQT_SLOT( shutdownGame() ), actionCollection() );
+ KStdGameAction::gameNew( gameBoard, TQT_SLOT( startNewGame() ), actionCollection() );
+ KStdGameAction::quit( this, TQT_SLOT( close() ), actionCollection() );
+ endAction = KStdGameAction::end( gameBoard, TQT_SLOT( shutdownGame() ), actionCollection() );
endAction->setEnabled(false);
//AB: there is no icon for disabled - TDEToolBar::insertButton shows the
//different state - TDEAction not :-(
- measureAction = new TDEAction( i18n("&Measure Distance"), "ruler", 0, TQT_TQOBJECT(gameBoard), TQT_SLOT( measureDistance() ), actionCollection(), "game_measure" );
+ measureAction = new TDEAction( i18n("&Measure Distance"), "ruler", 0, gameBoard, TQT_SLOT( measureDistance() ), actionCollection(), "game_measure" );
measureAction->setEnabled(false);
- standingAction = new TDEAction( i18n("&Show Standings"), "help", 0, TQT_TQOBJECT(gameBoard), TQT_SLOT( showScores() ), actionCollection(), "game_scores" );
+ standingAction = new TDEAction( i18n("&Show Standings"), "help", 0, gameBoard, TQT_SLOT( showScores() ), actionCollection(), "game_scores" );
standingAction->setEnabled(false);
- fleetAction = new TDEAction( i18n("&Fleet Overview"), "launch", 0, TQT_TQOBJECT(gameBoard), TQT_SLOT( showFleets() ), actionCollection(), "game_fleets" );
+ fleetAction = new TDEAction( i18n("&Fleet Overview"), "launch", 0, gameBoard, TQT_SLOT( showFleets() ), actionCollection(), "game_fleets" );
fleetAction->setEnabled(false);
toolBar()->setBarPos( TDEToolBar::Left );
toolBar()->setMovingEnabled( false );
@@ -60,7 +60,7 @@ MainWindow::setupGameBoard()
gameBoard = new GameBoard( this );
setCentralWidget(gameBoard);
- connect( gameBoard, TQT_SIGNAL( newGameState( GameState )), TQT_TQOBJECT(this), TQT_SLOT( gameStateChange( GameState ) ) );
+ connect( gameBoard, TQT_SIGNAL( newGameState( GameState )), this, TQT_SLOT( gameStateChange( GameState ) ) );
}