From 58a97ed3af5e4df6c4a58d043b0c267bd97056a9 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 15:12:46 -0600
Subject: Rename a number of classes to enhance compatibility with KDE4

---
 konquest/fleetdlg.cc |  2 +-
 konquest/mainwin.cc  | 16 ++++++++--------
 konquest/mainwin.h   |  6 +++---
 konquest/scoredlg.cc |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'konquest')

diff --git a/konquest/fleetdlg.cc b/konquest/fleetdlg.cc
index d45cb88e..ebe230c3 100644
--- a/konquest/fleetdlg.cc
+++ b/konquest/fleetdlg.cc
@@ -40,7 +40,7 @@ FleetDlg::FleetDlg( TQWidget *parent, AttackFleetList *fleets )
 {
     setCaption( kapp->makeStdCaption(i18n("Fleet Overview")) );
 
-    fleetTable = new KListView( this, 0 );
+    fleetTable = new TDEListView( this, 0 );
     fleetTable->addColumn(i18n("Fleet No."));
     fleetTable->addColumn(i18n("Destination"));
     fleetTable->addColumn(i18n("Ships"));
diff --git a/konquest/mainwin.cc b/konquest/mainwin.cc
index a5306172..fdc44e13 100644
--- a/konquest/mainwin.cc
+++ b/konquest/mainwin.cc
@@ -26,7 +26,7 @@ MainWindow::MainWindow()
     setCaption( i18n("Galactic Conquest") );
 
     setupGameBoard();
-    setupKAction();
+    setupTDEAction();
     setupGUI();
 }
 
@@ -35,22 +35,22 @@ MainWindow::~MainWindow()
 }
 
 void
-MainWindow::setupKAction()
+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() );
     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, TQT_TQOBJECT(gameBoard), TQT_SLOT( measureDistance() ), actionCollection(), "game_measure" );
+    //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->setEnabled(false);
-    standingAction = new KAction( i18n("&Show Standings"), "help", 0, TQT_TQOBJECT(gameBoard), TQT_SLOT( showScores() ), actionCollection(), "game_scores" );
+    standingAction = new TDEAction( 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, TQT_TQOBJECT(gameBoard), TQT_SLOT( showFleets() ), actionCollection(), "game_fleets" );
+    fleetAction = new TDEAction( i18n("&Fleet Overview"), "launch", 0, TQT_TQOBJECT(gameBoard), TQT_SLOT( showFleets() ), actionCollection(), "game_fleets" );
     fleetAction->setEnabled(false);
-    toolBar()->setBarPos( KToolBar::Left );
+    toolBar()->setBarPos( TDEToolBar::Left );
     toolBar()->setMovingEnabled( false );
 }
 
diff --git a/konquest/mainwin.h b/konquest/mainwin.h
index 230e69f2..63a68c0d 100644
--- a/konquest/mainwin.h
+++ b/konquest/mainwin.h
@@ -8,7 +8,7 @@
 class ConquestMap;
 class PlanetStatusTable;
 
-class MainWindow : public KMainWindow
+class MainWindow : public TDEMainWindow
 {
     Q_OBJECT
   
@@ -18,12 +18,12 @@ public:
     ~MainWindow();
 
 protected:
-    void setupKAction();
+    void setupTDEAction();
     void setupGameBoard();
 
 private:
     GameBoard *gameBoard;
-    KAction *endAction, *measureAction, *standingAction, *fleetAction;
+    TDEAction *endAction, *measureAction, *standingAction, *fleetAction;
 
 private slots:
     void gameStateChange( GameState );
diff --git a/konquest/scoredlg.cc b/konquest/scoredlg.cc
index fee4a404..0e259b95 100644
--- a/konquest/scoredlg.cc
+++ b/konquest/scoredlg.cc
@@ -32,7 +32,7 @@ ScoreDlg::ScoreDlg( TQWidget *parent, const TQString& title, PlayerList *players
 {
     setCaption( kapp->makeStdCaption(title) );
 
-    scoreTable = new KListView( this, 0 );
+    scoreTable = new TDEListView( this, 0 );
     scoreTable->addColumn(i18n("Player"));
     scoreTable->addColumn(i18n("Ships Built"));
     scoreTable->addColumn(i18n("Planets Conquered"));
-- 
cgit v1.2.1