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 --- konquest/fleetdlg.cpp | 2 +- konquest/gameboard.cpp | 8 ++++---- konquest/gamecore.cpp | 4 ++-- konquest/gameenddlg.cpp | 2 +- konquest/mainwin.cpp | 14 +++++++------- konquest/map_widget.cpp | 4 ++-- konquest/minimap.cpp | 2 +- konquest/newgamedlg.cpp | 14 +++++++------- konquest/scoredlg.cpp | 2 +- 9 files changed, 26 insertions(+), 26 deletions(-) (limited to 'konquest') diff --git a/konquest/fleetdlg.cpp b/konquest/fleetdlg.cpp index 5fd71239..8d980d64 100644 --- a/konquest/fleetdlg.cpp +++ b/konquest/fleetdlg.cpp @@ -62,7 +62,7 @@ FleetDlg::FleetDlg( TQWidget *parent, AttackFleetList *fleets ) layout2->addWidget( okButton ); layout2->addStretch( 2 ); - connect( okButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); + connect( okButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); init(); diff --git a/konquest/gameboard.cpp b/konquest/gameboard.cpp index b02ce64e..48e1d531 100644 --- a/konquest/gameboard.cpp +++ b/konquest/gameboard.cpp @@ -119,10 +119,10 @@ GameBoard::GameBoard( TQWidget *parent ) //********************************************************************** // Set up signal/slot connections //********************************************************************** - connect( mapWidget, TQT_SIGNAL( planetSelected(Planet *) ), this, TQT_SLOT(planetSelected(Planet *)) ); - connect( shipCountEdit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(newShipCount()) ); - connect( endTurn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( nextPlayer() ) ); - connect( mapWidget, TQT_SIGNAL( planetHighlighted(Planet *)), planetInfo, TQT_SLOT(showPlanet(Planet *)) ); + connect( mapWidget, TQ_SIGNAL( planetSelected(Planet *) ), this, TQ_SLOT(planetSelected(Planet *)) ); + connect( shipCountEdit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(newShipCount()) ); + connect( endTurn, TQ_SIGNAL( clicked() ), this, TQ_SLOT( nextPlayer() ) ); + connect( mapWidget, TQ_SIGNAL( planetHighlighted(Planet *)), planetInfo, TQ_SLOT(showPlanet(Planet *)) ); changeGameBoard( false ); } diff --git a/konquest/gamecore.cpp b/konquest/gamecore.cpp index 5f3e60c5..dc8c0cc3 100644 --- a/konquest/gamecore.cpp +++ b/konquest/gamecore.cpp @@ -78,7 +78,7 @@ Map::Map() for( int y = 0; y < columns; y++ ) { grid[x][y] = Sector( this, x, y ); - connect( &grid[x][y], TQT_SIGNAL( update() ), this, TQT_SLOT( childSectorUpdate() )); + connect( &grid[x][y], TQ_SIGNAL( update() ), this, TQ_SLOT( childSectorUpdate() )); } } } @@ -265,7 +265,7 @@ void Sector::setPlanet( Planet *newPlanet ) { planet = newPlanet; - connect( planet, TQT_SIGNAL( update() ), this, TQT_SLOT( childPlanetUpdate() ) ); + connect( planet, TQ_SIGNAL( update() ), this, TQ_SLOT( childPlanetUpdate() ) ); emit update(); } diff --git a/konquest/gameenddlg.cpp b/konquest/gameenddlg.cpp index 0f8f5e7a..5d049599 100644 --- a/konquest/gameenddlg.cpp +++ b/konquest/gameenddlg.cpp @@ -35,7 +35,7 @@ GameEndDlg::GameEndDlg( TQWidget *parent ) init(); - connect( turnCount, TQT_SIGNAL(valueChanged( int )), this, TQT_SLOT(turnCountChange( int )) ); + connect( turnCount, TQ_SIGNAL(valueChanged( int )), this, TQ_SLOT(turnCountChange( int )) ); } GameEndDlg::~GameEndDlg() diff --git a/konquest/mainwin.cpp b/konquest/mainwin.cpp index 2131b589..3ec192d7 100644 --- a/konquest/mainwin.cpp +++ b/konquest/mainwin.cpp @@ -37,18 +37,18 @@ MainWindow::~MainWindow() void MainWindow::setupTDEAction() { - KStdGameAction::gameNew( gameBoard, TQT_SLOT( startNewGame() ), actionCollection() ); - KStdGameAction::quit( this, TQT_SLOT( close() ), actionCollection() ); - endAction = KStdGameAction::end( gameBoard, TQT_SLOT( shutdownGame() ), actionCollection() ); + KStdGameAction::gameNew( gameBoard, TQ_SLOT( startNewGame() ), actionCollection() ); + KStdGameAction::quit( this, TQ_SLOT( close() ), actionCollection() ); + endAction = KStdGameAction::end( gameBoard, TQ_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, gameBoard, TQT_SLOT( measureDistance() ), actionCollection(), "game_measure" ); + measureAction = new TDEAction( i18n("&Measure Distance"), "ruler", 0, gameBoard, TQ_SLOT( measureDistance() ), actionCollection(), "game_measure" ); measureAction->setEnabled(false); - standingAction = new TDEAction( i18n("&Show Standings"), "help", 0, gameBoard, TQT_SLOT( showScores() ), actionCollection(), "game_scores" ); + standingAction = new TDEAction( i18n("&Show Standings"), "help", 0, gameBoard, TQ_SLOT( showScores() ), actionCollection(), "game_scores" ); standingAction->setEnabled(false); - fleetAction = new TDEAction( i18n("&Fleet Overview"), "launch", 0, gameBoard, TQT_SLOT( showFleets() ), actionCollection(), "game_fleets" ); + fleetAction = new TDEAction( i18n("&Fleet Overview"), "launch", 0, gameBoard, TQ_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 )), this, TQT_SLOT( gameStateChange( GameState ) ) ); + connect( gameBoard, TQ_SIGNAL( newGameState( GameState )), this, TQ_SLOT( gameStateChange( GameState ) ) ); } diff --git a/konquest/map_widget.cpp b/konquest/map_widget.cpp index af39b032..912dfc97 100644 --- a/konquest/map_widget.cpp +++ b/konquest/map_widget.cpp @@ -32,10 +32,10 @@ ConquestMap::ConquestMap( Map *newMap, TQWidget *parent ) setMinimumSize( BOARD_HEIGHT, BOARD_WIDTH ); setMaximumSize( BOARD_HEIGHT, BOARD_WIDTH ); - connect( map, TQT_SIGNAL( update() ), this, TQT_SLOT( mapUpdate() ) ); + connect( map, TQ_SIGNAL( update() ), this, TQ_SLOT( mapUpdate() ) ); TQTimer *timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(squareBlink()) ); + connect( timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(squareBlink()) ); timer->start( 500, false ); viewport()->setMouseTracking( true ); diff --git a/konquest/minimap.cpp b/konquest/minimap.cpp index 479e997e..4334e832 100644 --- a/konquest/minimap.cpp +++ b/konquest/minimap.cpp @@ -39,7 +39,7 @@ MiniMap::setMap(Map *newMap) setMinimumSize( BOARD_HEIGHT, BOARD_WIDTH ); setMaximumSize( BOARD_HEIGHT, BOARD_WIDTH ); - connect( map, TQT_SIGNAL( update() ), this, TQT_SLOT( mapUpdate() ) ); + connect( map, TQ_SIGNAL( update() ), this, TQ_SLOT( mapUpdate() ) ); } MiniMap::~MiniMap() diff --git a/konquest/newgamedlg.cpp b/konquest/newgamedlg.cpp index b609f1a2..f510defd 100644 --- a/konquest/newgamedlg.cpp +++ b/konquest/newgamedlg.cpp @@ -43,13 +43,13 @@ NewGameDlg::NewGameDlg( TQWidget *parent, Map *pmap, PlayerList *players, w->newPlayer->setMaxLength( 8 ); - connect(w->sliderPlayers, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotPlayerCount(int))); - connect(w->sliderPlanets, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotNewMap())); - connect(w->sliderTurns, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotTurns())); - connect(w->rejectMap, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewMap())); - connect(w->newPlayer, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotNewPlayer())); - connect(w->newPlayer, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotAddPlayer())); - connect(w->addPlayer, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddPlayer())); + connect(w->sliderPlayers, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotPlayerCount(int))); + connect(w->sliderPlanets, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotNewMap())); + connect(w->sliderTurns, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotTurns())); + connect(w->rejectMap, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewMap())); + connect(w->newPlayer, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotNewPlayer())); + connect(w->newPlayer, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotAddPlayer())); + connect(w->addPlayer, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddPlayer())); init(); diff --git a/konquest/scoredlg.cpp b/konquest/scoredlg.cpp index a633e3b6..0c4019ae 100644 --- a/konquest/scoredlg.cpp +++ b/konquest/scoredlg.cpp @@ -55,7 +55,7 @@ ScoreDlg::ScoreDlg( TQWidget *parent, const TQString& title, PlayerList *players layout2->addWidget( okButton ); layout2->addStretch( 2 ); - connect( okButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); + connect( okButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); init(); -- cgit v1.2.1