24 files changed, 52 insertions, 52 deletions
diff --git a/konquest/CMakeLists.txt b/konquest/CMakeLists.txt
index 88e56e8d..79bfa0b4 100644
--- a/konquest/CMakeLists.txt
+++ b/konquest/CMakeLists.txt
@@ -19,9 +19,9 @@ link_directories(
 ##### konquest (executable) #####################
 
 tde_add_executable( konquest AUTOMOC
-  SOURCES Konquest.cc gameboard.cc gamecore.cc int_validator.cc mainwin.cc
-    map_widget.cc minimap.cc newgamedlg.cc planet_info.cc gameenddlg.cc
-    scoredlg.cc fleetdlg.cc newGameDlg_ui.ui
+  SOURCES Konquest.cpp gameboard.cpp gamecore.cpp int_validator.cpp mainwin.cpp
+    map_widget.cpp minimap.cpp newgamedlg.cpp planet_info.cpp gameenddlg.cpp
+    scoredlg.cpp fleetdlg.cpp newGameDlg_ui.ui
   LINK tdecore-shared tdeui-shared tdeio-shared tdegames-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/konquest/ChangeLog b/konquest/ChangeLog
index 0601252e..74a128b1 100644
--- a/konquest/ChangeLog
+++ b/konquest/ChangeLog
@@ -5,16 +5,16 @@
 
 2004-08-22  Inge Wallin  <inge@lysator.liu.se>
 
-	* gameboard.cc (nextTurn): Fixed a grammatical error.
+	* gameboard.cpp (nextTurn): Fixed a grammatical error.
 
 0.99.4 --
 	Brought the KDE CVS tree in sync with my own. Changes from previous version
-        include:
+	include:
 		-- removed dependence on libg++ random integer classes
-                -- fixed a couple of problems with the game state machine.
+		-- fixed a couple of problems with the game state machine.
 
 0.0.4 --
-	Fixed (hopefully) a compiler error. gamecore.cc would compile fine with
+	Fixed (hopefully) a compiler error. gamecore.cpp would compile fine with
 		debug (-g), but not with the optimizer (-O2). Added a destructor
 		and things seem okay.
 
diff --git a/konquest/Konquest.cc b/konquest/Konquest.cpp
index a0c772a8..a0c772a8 100644
--- a/konquest/Konquest.cc
+++ b/konquest/Konquest.cpp
diff --git a/konquest/Makefile.am b/konquest/Makefile.am
index 96dc993a..0f8f4ce0 100644
--- a/konquest/Makefile.am
+++ b/konquest/Makefile.am
@@ -4,9 +4,9 @@ INCLUDES= -I$(top_srcdir)/libtdegames $(all_includes)
 KDE_ICON = konquest
 
 bin_PROGRAMS = konquest
-konquest_SOURCES = Konquest.cc gameboard.cc gamecore.cc int_validator.cc \
-	mainwin.cc map_widget.cc minimap.cc newgamedlg.cc planet_info.cc \
-	gameenddlg.cc  scoredlg.cc fleetdlg.cc newGameDlg_ui.ui
+konquest_SOURCES = Konquest.cpp gameboard.cpp gamecore.cpp int_validator.cpp \
+	mainwin.cpp map_widget.cpp minimap.cpp newgamedlg.cpp planet_info.cpp \
+	gameenddlg.cpp  scoredlg.cpp fleetdlg.cpp newGameDlg_ui.ui
 konquest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 konquest_LDADD = $(LIB_TDEGAMES)
 konquest_DEPENDENCIES = $(LIB_TDEGAMES_DEP)
@@ -20,4 +20,4 @@ rcdir = $(kde_datadir)/konquest
 rc_DATA = konquestui.rc
 
 messages: rc.cpp
-	$(XGETTEXT) rc.cpp *.cc -o $(podir)/konquest.pot
+	$(XGETTEXT) rc.cpp $(podir)/konquest.pot
diff --git a/konquest/fleetdlg.cc b/konquest/fleetdlg.cpp
index 5fd71239..8d980d64 100644
--- a/konquest/fleetdlg.cc
+++ 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.cc b/konquest/gameboard.cpp
index 69aec42c..48e1d531 100644
--- a/konquest/gameboard.cc
+++ b/konquest/gameboard.cpp
@@ -82,7 +82,7 @@ GameBoard::GameBoard( TQWidget *parent )
     setMinimumSize( 600, 600 );
 
     setMouseTracking( true );
-    setFocusPolicy( TQ_StrongFocus );
+    setFocusPolicy( TQWidget::StrongFocus );
     setFocus();
 
     //********************************************************************
@@ -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/gameboard.h b/konquest/gameboard.h
index 5078cfda..cf0d6a21 100644
--- a/konquest/gameboard.h
+++ b/konquest/gameboard.h
@@ -23,7 +23,7 @@ enum GameState { NONE, SOURCE_PLANET, DEST_PLANET, SHIP_COUNT, RULER_SOURCE, RUL
 //************************************************************************
 class GameBoard : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/konquest/gamecore.cc b/konquest/gamecore.cpp
index 5f3e60c5..dc8c0cc3 100644
--- a/konquest/gamecore.cc
+++ 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/gamecore.h b/konquest/gamecore.h
index 6bc3af38..9d82029f 100644
--- a/konquest/gamecore.h
+++ b/konquest/gamecore.h
@@ -173,7 +173,7 @@ public:
 
 class Planet : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 private:
@@ -228,7 +228,7 @@ private:
 
 class Sector : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
@@ -272,7 +272,7 @@ protected:
 
 class Map : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/konquest/gameenddlg.cc b/konquest/gameenddlg.cpp
index d999c375..5d049599 100644
--- a/konquest/gameenddlg.cc
+++ b/konquest/gameenddlg.cpp
@@ -23,7 +23,7 @@ GameEndDlg::GameEndDlg( TQWidget *parent )
     label1->setAlignment( AlignCenter );
     
     turnCountLbl = new TQLabel( page );
-    turnCount = new TQSlider( 1, 40, 1, 5, Qt::Horizontal, page );
+    turnCount = new TQSlider( 1, 40, 1, 5, TQt::Horizontal, page );
 
     KGuiItem addTurns(i18n("&Add Turns"), TQString(), TQString(),
                       i18n("Add the specified number of turns to the game and continue playing."));
@@ -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/gameenddlg.h b/konquest/gameenddlg.h
index 5eccb794..b1062e8a 100644
--- a/konquest/gameenddlg.h
+++ b/konquest/gameenddlg.h
@@ -8,7 +8,7 @@ class TQPushButton;
 
 class GameEndDlg : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/konquest/int_validator.cc b/konquest/int_validator.cpp
index dd96ca82..12f707c6 100644
--- a/konquest/int_validator.cc
+++ 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/int_validator.h b/konquest/int_validator.h
index 7af62d19..2723f43c 100644
--- a/konquest/int_validator.h
+++ b/konquest/int_validator.h
@@ -6,7 +6,7 @@
 
 class IntValidator : public TQValidator
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/konquest/mainwin.cc b/konquest/mainwin.cpp
index 8982974a..3ec192d7 100644
--- a/konquest/mainwin.cc
+++ 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, 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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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 )), TQT_TQOBJECT(this), TQT_SLOT( gameStateChange( GameState ) ) );
+    connect( gameBoard, TQ_SIGNAL( newGameState( GameState )), this, TQ_SLOT( gameStateChange( GameState ) ) );
 }
 
 
diff --git a/konquest/mainwin.h b/konquest/mainwin.h
index 36c31038..81941999 100644
--- a/konquest/mainwin.h
+++ b/konquest/mainwin.h
@@ -10,7 +10,7 @@ class PlanetStatusTable;
 
 class MainWindow : public TDEMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/konquest/map_widget.cc b/konquest/map_widget.cpp
index af39b032..912dfc97 100644
--- a/konquest/map_widget.cc
+++ 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/map_widget.h b/konquest/map_widget.h
index 45e67d9e..1a8eccff 100644
--- a/konquest/map_widget.h
+++ b/konquest/map_widget.h
@@ -15,7 +15,7 @@
 
 class ConquestMap : public TQGridView
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     // Constructors
diff --git a/konquest/minimap.cc b/konquest/minimap.cpp
index 479e997e..4334e832 100644
--- a/konquest/minimap.cc
+++ 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/minimap.h b/konquest/minimap.h
index 417a2c54..ca65464b 100644
--- a/konquest/minimap.h
+++ b/konquest/minimap.h
@@ -13,7 +13,7 @@
 
 class MiniMap : public TQGridView
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     // Constructors
diff --git a/konquest/newgamedlg.cc b/konquest/newgamedlg.cpp
index b609f1a2..f510defd 100644
--- a/konquest/newgamedlg.cc
+++ 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/newgamedlg.h b/konquest/newgamedlg.h
index ac6ac268..1843ac90 100644
--- a/konquest/newgamedlg.h
+++ b/konquest/newgamedlg.h
@@ -14,7 +14,7 @@ class NewGameDlgUI;
 
 class NewGameDlg : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/konquest/planet_info.cc b/konquest/planet_info.cpp
index d4c3cbaa..d4c3cbaa 100644
--- a/konquest/planet_info.cc
+++ b/konquest/planet_info.cpp
diff --git a/konquest/planet_info.h b/konquest/planet_info.h
index 3a9247df..47904b14 100644
--- a/konquest/planet_info.h
+++ b/konquest/planet_info.h
@@ -22,7 +22,7 @@ typedef TQPtrListIterator<planet_info_buffer> PlanetInfoListIterator;
 
 class PlanetInfo : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
   
         
 public:
diff --git a/konquest/scoredlg.cc b/konquest/scoredlg.cpp
index a633e3b6..0c4019ae 100644
--- a/konquest/scoredlg.cc
+++ 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();