Rename a number of classes to enhance compatibility with KDE4

7 files changed, 29 insertions, 29 deletions

diff --git a/kreversi/ChangeLog b/kreversi/ChangeLog
index 0df10052..e9938661 100644
--- a/kreversi/ChangeLog
+++ b/kreversi/ChangeLog
@@ -317,7 +317,7 @@
 
 2004-09-25  Inge Wallin  <inge@lysator.liu.se>
 
-	Transfer the rest of the slots for KActions to kreversi.cpp
+	Transfer the rest of the slots for TDEActions to kreversi.cpp
 	* Board::interrupt()  -> KReversi::slotInterrupt()
 	* Board::doContinue() -> KReversi::slotContinue()
 	
@@ -332,7 +332,7 @@
 
 	Start the work to port KReversi to KGame/Kplayer:
 
-	Transfer the slots for most KActions to kreversi.cpp 
+	Transfer the slots for most TDEActions to kreversi.cpp 
 	* Board::undo() -> KReversi::slotUndo()
 	(Board::doUndo()): Do the real work of undoing.
 	* Board->hint() -> KReversi::slotHint()
diff --git a/kreversi/DESIGN b/kreversi/DESIGN
index 08c329fd..8b01b879 100644
--- a/kreversi/DESIGN
+++ b/kreversi/DESIGN
@@ -102,7 +102,7 @@ QReversiBoardView
 
 KReversi
     The main class for the KReversi program
-    Contains: KActions
+    Contains: TDEActions
 	      *QReversiGame 	 (owner)
 	      *KReversiGameView  (owner)
 	      *Engine            (owner)
diff --git a/kreversi/TODO b/kreversi/TODO
index 4e81f5d1..e3b13243 100644
--- a/kreversi/TODO
+++ b/kreversi/TODO
@@ -46,7 +46,7 @@ Next
      1. Fix a ReversiGame (formerly known as Game)			DONE
         - Clean it up. (Only store the moves).
         - Add a few necessary methods.
-     2. Move all the slots for KActions to kreversi.cpp			DONE
+     2. Move all the slots for TDEActions to kreversi.cpp			DONE
      3. Move the ownership of the engine and the game to kreversi.	DONE
      4. Create a new class QReversiGame, that inherits ReversiGame	DONE
 	and sends a lot of signals.
diff --git a/kreversi/kreversi.cpp b/kreversi/kreversi.cpp
index c3a047e3..5132d730 100644
--- a/kreversi/kreversi.cpp
+++ b/kreversi/kreversi.cpp
@@ -108,7 +108,7 @@ KReversi::KReversi()
   top->addMultiCellWidget(m_gameView, 0, 1, 0, 0);
 
   // Populate the GUI.
-  createKActions();
+  createTDEActions();
   addWidget(m_gameView);
 
   // Connect the signals from the game with slots of the view
@@ -144,10 +144,10 @@ KReversi::~KReversi()
 
 
 
-// Create all KActions used in KReversi.
+// Create all TDEActions used in KReversi.
 //
 
-void KReversi::createKActions()
+void KReversi::createTDEActions()
 {
   // Standard Game Actions.
   KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(slotNewGame()),  actionCollection(), 
@@ -161,13 +161,13 @@ void KReversi::createKActions()
 		       "game_undo");
 
   // Non-standard Game Actions: Stop, Continue, Switch sides
-  stopAction = new KAction(i18n("&Stop Thinking"), "game_stop", TQt::Key_Escape,
+  stopAction = new TDEAction(i18n("&Stop Thinking"), "game_stop", TQt::Key_Escape,
 			   TQT_TQOBJECT(this), TQT_SLOT(slotInterrupt()), actionCollection(),
 			   "game_stop");
-  continueAction = new KAction(i18n("&Continue Thinking"), "reload", 0,
+  continueAction = new TDEAction(i18n("&Continue Thinking"), "reload", 0,
 			       TQT_TQOBJECT(this), TQT_SLOT(slotContinue()), actionCollection(),
 			       "game_continue");
-  new KAction(i18n("S&witch Sides"), 0, 0,
+  new TDEAction(i18n("S&witch Sides"), 0, 0,
 	      TQT_TQOBJECT(this), TQT_SLOT(slotSwitchSides()), actionCollection(),
 	      "game_switch_sides");
 
@@ -176,11 +176,11 @@ void KReversi::createKActions()
   KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotEditSettings()), actionCollection());
 
   // Actions for the view(s).
-  showLastMoveAction = new KToggleAction(i18n("Show Last Move"), "lastmoves", 0, 
+  showLastMoveAction = new TDEToggleAction(i18n("Show Last Move"), "lastmoves", 0, 
 					 TQT_TQOBJECT(this), TQT_SLOT(slotShowLastMove()),
 					 actionCollection(),
 					 "show_last_move");
-  showLegalMovesAction = new KToggleAction(i18n("Show Legal Moves"), "legalmoves", 0, 
+  showLegalMovesAction = new TDEToggleAction(i18n("Show Legal Moves"), "legalmoves", 0, 
 					   TQT_TQOBJECT(this), TQT_SLOT(slotShowLegalMoves()),
 					   actionCollection(),
 					   "show_legal_moves");
@@ -209,7 +209,7 @@ void KReversi::setStrength(uint strength)
 
 
 // ----------------------------------------------------------------
-//                        Slots for KActions
+//                        Slots for TDEActions
 
 
 // A slot that is called when the user wants a new game.
diff --git a/kreversi/kreversi.h b/kreversi/kreversi.h
index f702189b..efdbc4e7 100644
--- a/kreversi/kreversi.h
+++ b/kreversi/kreversi.h
@@ -53,7 +53,7 @@
 
 class TQLabel;
 
-class KAction;
+class TDEAction;
 
 
 class KReversi : public KZoomMainWindow 
@@ -88,7 +88,7 @@ public:
 
 private:
   // Initialisation
-  void     createKActions();
+  void     createTDEActions();
 
   // View functions.
   TQString  getPlayerName();
@@ -105,7 +105,7 @@ private:
 
 private slots:
 
-  // Slots for KActions.
+  // Slots for TDEActions.
   void  slotNewGame();
   void  slotOpenGame();
   void  slotSave();
@@ -113,7 +113,7 @@ private slots:
   void  slotUndo();
   void  slotSwitchSides();
 
-  // Interrupt and continue the engines thinking (also KActions).
+  // Interrupt and continue the engines thinking (also TDEActions).
   void  slotInterrupt();
   void  slotContinue();
   void  slotShowLastMove();
@@ -151,11 +151,11 @@ private:
 
 private:
   // Some Actions that need to be manipulated.
-  KAction       *stopAction;
-  KAction       *continueAction;
+  TDEAction       *stopAction;
+  TDEAction       *continueAction;
 
-  KToggleAction  *showLastMoveAction;
-  KToggleAction  *showLegalMovesAction;
+  TDEToggleAction  *showLastMoveAction;
+  TDEToggleAction  *showLegalMovesAction;
 
   // The game itself and game properties
   QReversiGame  *m_game;	   // The main document - the game
diff --git a/kreversi/kzoommainwindow.cpp b/kreversi/kzoommainwindow.cpp
index 6d8b29fb..edc0311f 100644
--- a/kreversi/kzoommainwindow.cpp
+++ b/kreversi/kzoommainwindow.cpp
@@ -29,7 +29,7 @@
 
 KZoomMainWindow::KZoomMainWindow(uint min, uint max, uint step, 
 				 const char *name)
-  : KMainWindow(0, name), m_zoomStep(step), m_minZoom(min), m_maxZoom(max)
+  : TDEMainWindow(0, name), m_zoomStep(step), m_minZoom(min), m_maxZoom(max)
 {
   installEventFilter(this);
   
@@ -87,7 +87,7 @@ bool KZoomMainWindow::eventFilter(TQObject *o, TQEvent *e)
     setFixedSize(minimumSize()); // because K/TQMainWindow
                                  // does not manage fixed central widget
                                  // with hidden menubar...
-  return KMainWindow::eventFilter(o, e);
+  return TDEMainWindow::eventFilter(o, e);
 }
 
 
@@ -131,5 +131,5 @@ bool KZoomMainWindow::queryExit()
 {
   writeMenubarVisibleSetting(m_menu->isChecked());
 
-  return KMainWindow::queryExit();
+  return TDEMainWindow::queryExit();
 }
diff --git a/kreversi/kzoommainwindow.h b/kreversi/kzoommainwindow.h
index 0e74b715..2eccc59d 100644
--- a/kreversi/kzoommainwindow.h
+++ b/kreversi/kzoommainwindow.h
@@ -25,7 +25,7 @@
 #include <kmainwindow.h>
 
 
-class KToggleAction;
+class TDEToggleAction;
 
 
 /**
@@ -44,7 +44,7 @@ class KToggleAction;
  * of a context popup menu (useful to restore the menubar when hidden).
  */
 
-class KZoomMainWindow : public KMainWindow
+class KZoomMainWindow : public TDEMainWindow
 {
   Q_OBJECT
   
@@ -127,9 +127,9 @@ private:
 
   TQPtrList<TQWidget>  m_widgets;
 
-  KAction        *m_zoomInAction;
-  KAction        *m_zoomOutAction;
-  KToggleAction  *m_menu;
+  TDEAction        *m_zoomInAction;
+  TDEAction        *m_zoomOutAction;
+  TDEToggleAction  *m_menu;
   
   class  KZoomMainWindowPrivate;
   KZoomMainWindowPrivate  *d;