diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 04:58:26 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 04:58:26 +0000 |
commit | 838baf3f99ec5ab81b063eb5449a3381d860f377 (patch) | |
tree | dd31abcfde08ca92e4623b8f50b3d762a87c997a /konquest/mainwin.cc | |
parent | 2bf598bafa22fac4126fc8842df6b0119aadc0e9 (diff) | |
download | tdegames-838baf3f99ec5ab81b063eb5449a3381d860f377.tar.gz tdegames-838baf3f99ec5ab81b063eb5449a3381d860f377.zip |
TQt4 port kdegames
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegames@1236074 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'konquest/mainwin.cc')
-rw-r--r-- | konquest/mainwin.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/konquest/mainwin.cc b/konquest/mainwin.cc index 866cd936..a5306172 100644 --- a/konquest/mainwin.cc +++ b/konquest/mainwin.cc @@ -37,18 +37,18 @@ MainWindow::~MainWindow() void MainWindow::setupKAction() { - KStdGameAction::gameNew( gameBoard, TQT_SLOT( startNewGame() ), actionCollection() ); - KStdGameAction::quit( this, TQT_SLOT( close() ), actionCollection() ); - endAction = KStdGameAction::end( gameBoard, TQT_SLOT( shutdownGame() ), actionCollection() ); + 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() ); endAction->setEnabled(false); //AB: there is no icon for disabled - KToolBar::insertButton shows the //different state - KAction not :-( - measureAction = new KAction( i18n("&Measure Distance"), "ruler", 0, gameBoard, TQT_SLOT( measureDistance() ), actionCollection(), "game_measure" ); + measureAction = new KAction( i18n("&Measure Distance"), "ruler", 0, TQT_TQOBJECT(gameBoard), TQT_SLOT( measureDistance() ), actionCollection(), "game_measure" ); measureAction->setEnabled(false); - standingAction = new KAction( i18n("&Show Standings"), "help", 0, gameBoard, TQT_SLOT( showScores() ), actionCollection(), "game_scores" ); + standingAction = new KAction( i18n("&Show Standings"), "help", 0, TQT_TQOBJECT(gameBoard), TQT_SLOT( showScores() ), actionCollection(), "game_scores" ); standingAction->setEnabled(false); - fleetAction = new KAction( i18n("&Fleet Overview"), "launch", 0, gameBoard, TQT_SLOT( showFleets() ), actionCollection(), "game_fleets" ); + fleetAction = new KAction( i18n("&Fleet Overview"), "launch", 0, TQT_TQOBJECT(gameBoard), TQT_SLOT( showFleets() ), actionCollection(), "game_fleets" ); fleetAction->setEnabled(false); toolBar()->setBarPos( KToolBar::Left ); toolBar()->setMovingEnabled( false ); @@ -60,7 +60,7 @@ MainWindow::setupGameBoard() gameBoard = new GameBoard( this ); setCentralWidget(gameBoard); - connect( gameBoard, TQT_SIGNAL( newGameState( GameState )), this, TQT_SLOT( gameStateChange( GameState ) ) ); + connect( gameBoard, TQT_SIGNAL( newGameState( GameState )), TQT_TQOBJECT(this), TQT_SLOT( gameStateChange( GameState ) ) ); } |