Rename a number of classes to enhance compatibility with KDE4

2 files changed, 19 insertions, 19 deletions

diff --git a/kblackbox/kbbgame.cpp b/kblackbox/kbbgame.cpp
index aabdbff5..a8c51100 100644
--- a/kblackbox/kbbgame.cpp
+++ b/kblackbox/kbbgame.cpp
@@ -87,7 +87,7 @@ KBBGame::KBBGame()
   statusBar()->insertItem(i18n("Run: yesno"), SRUN);
   statusBar()->insertItem(i18n("Size: 00 x 00"), SSIZE);
 
-  initKAction();
+  initTDEAction();
 
   connect( gr, TQT_SIGNAL(inputAt(int,int,int)),
 	  this, TQT_SLOT(gotInputAt(int,int,int)) );
@@ -695,40 +695,40 @@ void KBBGame::gotInputAt( int col, int row, int state )
   updateStats();
 }
 
-void KBBGame::initKAction()
+void KBBGame::initTDEAction()
 {
 // game
   KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(newGame()), actionCollection());
-  (void)new KAction( i18n("&Give Up"), SmallIcon("giveup"), 0, TQT_TQOBJECT(this), TQT_SLOT(giveUp()), actionCollection(), "game_giveup" );
-  (void)new KAction( i18n("&Done"), SmallIcon("done"), 0, TQT_TQOBJECT(this), TQT_SLOT(gameFinished()), actionCollection(), "game_done" );
-  (void)new KAction( i18n("&Resize"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotResize()), actionCollection(), "game_resize" );
+  (void)new TDEAction( i18n("&Give Up"), SmallIcon("giveup"), 0, TQT_TQOBJECT(this), TQT_SLOT(giveUp()), actionCollection(), "game_giveup" );
+  (void)new TDEAction( i18n("&Done"), SmallIcon("done"), 0, TQT_TQOBJECT(this), TQT_SLOT(gameFinished()), actionCollection(), "game_done" );
+  (void)new TDEAction( i18n("&Resize"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotResize()), actionCollection(), "game_resize" );
   KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
 
 
 // settings
-  sizeAction = new KSelectAction( i18n("&Size"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSize()), actionCollection(), "options_size");
+  sizeAction = new TDESelectAction( i18n("&Size"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSize()), actionCollection(), "options_size");
   TQStringList list;
   list.append(i18n("  8 x  8 "));
   list.append(i18n(" 10 x 10 "));
   list.append(i18n(" 12 x 12 "));
   sizeAction->setItems(list);
 
-  ballsAction = new KSelectAction( i18n("&Balls"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBalls()), actionCollection(), "options_balls");
+  ballsAction = new TDESelectAction( i18n("&Balls"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBalls()), actionCollection(), "options_balls");
   list.clear();
   list.append(i18n(" 4 "));
   list.append(i18n(" 6 "));
   list.append(i18n(" 8 "));
   ballsAction->setItems(list);
-  tutorialAction = new KToggleAction( i18n("&Tutorial"), 0, TQT_TQOBJECT(this), TQT_SLOT(tutorialSwitch()), actionCollection(), "options_tutorial" );
+  tutorialAction = new TDEToggleAction( i18n("&Tutorial"), 0, TQT_TQOBJECT(this), TQT_SLOT(tutorialSwitch()), actionCollection(), "options_tutorial" );
 //  KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), 
 //actionCollection());
 
 // keyboard only
-  (void)new KAction( i18n("Move Down"), TQt::Key_Down, TQT_TQOBJECT(gr), TQT_SLOT(slotDown()), actionCollection(), "move_down" );
-  (void)new KAction( i18n("Move Up"), TQt::Key_Up, TQT_TQOBJECT(gr), TQT_SLOT(slotUp()), actionCollection(), "move_up" );
-  (void)new KAction( i18n("Move Left"), TQt::Key_Left, TQT_TQOBJECT(gr), TQT_SLOT(slotLeft()), actionCollection(), "move_left" );
-  (void)new KAction( i18n("Move Right"), TQt::Key_Right, TQT_TQOBJECT(gr), TQT_SLOT(slotRight()), actionCollection(), "move_right" );
-  (void)new KAction( i18n("Trigger Action"), TQt::Key_Return, TQT_TQOBJECT(gr), TQT_SLOT(slotInput()), actionCollection(), "move_trigger" );
+  (void)new TDEAction( i18n("Move Down"), TQt::Key_Down, TQT_TQOBJECT(gr), TQT_SLOT(slotDown()), actionCollection(), "move_down" );
+  (void)new TDEAction( i18n("Move Up"), TQt::Key_Up, TQT_TQOBJECT(gr), TQT_SLOT(slotUp()), actionCollection(), "move_up" );
+  (void)new TDEAction( i18n("Move Left"), TQt::Key_Left, TQT_TQOBJECT(gr), TQT_SLOT(slotLeft()), actionCollection(), "move_left" );
+  (void)new TDEAction( i18n("Move Right"), TQt::Key_Right, TQT_TQOBJECT(gr), TQT_SLOT(slotRight()), actionCollection(), "move_right" );
+  (void)new TDEAction( i18n("Trigger Action"), TQt::Key_Return, TQT_TQOBJECT(gr), TQT_SLOT(slotInput()), actionCollection(), "move_trigger" );
 }
 
 void KBBGame::slotResize()
diff --git a/kblackbox/kbbgame.h b/kblackbox/kbbgame.h
index 22305a46..de73cb9e 100644
--- a/kblackbox/kbbgame.h
+++ b/kblackbox/kbbgame.h
@@ -18,8 +18,8 @@
 #include <kmainwindow.h>
 #include <krandomsequence.h>
 
-class KSelectAction;
-class KToggleAction;
+class TDESelectAction;
+class TDEToggleAction;
 
 /*
    Types of the boxes (used f.e.g. in the traceRay() method)
@@ -47,7 +47,7 @@ class KToggleAction;
 #define SRUN   2
 #define SSIZE  3
 
-class KBBGame : public KMainWindow
+class KBBGame : public TDEMainWindow
 {
   Q_OBJECT
   
@@ -83,7 +83,7 @@ private:
   int traceRay( int startX, int startY, int *endX, int *endY );
   void remap( RectOnArray *gam, RectOnArray *gra );
   void getResults();
-  void initKAction();
+  void initTDEAction();
 
   int balls;
   int detourCounter;
@@ -98,8 +98,8 @@ private:
   TQLabel *statusText;*/
   KRandomSequence random;
 
-  KSelectAction *ballsAction, *sizeAction;
-  KToggleAction *tutorialAction;
+  TDESelectAction *ballsAction, *sizeAction;
+  TDEToggleAction *tutorialAction;
 };
 
 #endif // KBBGAME_H