Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

2 files changed, 22 insertions, 22 deletions

diff --git a/kreversi/kreversi.cpp b/kreversi/kreversi.cpp
index 7e2e83ff..be02d428 100644
--- a/kreversi/kreversi.cpp
+++ b/kreversi/kreversi.cpp
@@ -116,15 +116,15 @@ KReversi::KReversi()
   // The only part of the view that is left in this class is the
   // indicator of whose turn it is in the status bar.  The rest is
   // in the game view.
-  connect(m_game, TQT_SIGNAL(sig_newGame()),  TQT_TQOBJECT(this), TQT_SLOT(showTurn()));
+  connect(m_game, TQT_SIGNAL(sig_newGame()),  this, TQT_SLOT(showTurn()));
   connect(m_game, TQT_SIGNAL(sig_move(uint, Move&)), 
-	  TQT_TQOBJECT(this),   TQT_SLOT(handleMove(uint, Move&))); // Calls showTurn().
-  connect(m_game, TQT_SIGNAL(sig_update()),   TQT_TQOBJECT(this), TQT_SLOT(showTurn()));
-  connect(m_game, TQT_SIGNAL(sig_gameOver()), TQT_TQOBJECT(this), TQT_SLOT(slotGameOver()));
+	  this,   TQT_SLOT(handleMove(uint, Move&))); // Calls showTurn().
+  connect(m_game, TQT_SIGNAL(sig_update()),   this, TQT_SLOT(showTurn()));
+  connect(m_game, TQT_SIGNAL(sig_gameOver()), this, TQT_SLOT(slotGameOver()));
 
   // Signal that is sent when the user clicks on the board.
   connect(m_gameView, TQT_SIGNAL(signalSquareClicked(int, int)),
-	  TQT_TQOBJECT(this),       TQT_SLOT(slotSquareClicked(int, int)));
+	  this,       TQT_SLOT(slotSquareClicked(int, int)));
 
   loadSettings();
 
@@ -150,38 +150,38 @@ KReversi::~KReversi()
 void KReversi::createTDEActions()
 {
   // Standard Game Actions.
-  KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(slotNewGame()),  actionCollection(), 
+  KStdGameAction::gameNew(this, TQT_SLOT(slotNewGame()),  actionCollection(), 
 			  "game_new");
-  KStdGameAction::load(TQT_TQOBJECT(this),    TQT_SLOT(slotOpenGame()), actionCollection());
-  KStdGameAction::save(TQT_TQOBJECT(this),    TQT_SLOT(slotSave()),     actionCollection());
-  KStdGameAction::quit(TQT_TQOBJECT(this),    TQT_SLOT(close()),        actionCollection());
-  KStdGameAction::hint(TQT_TQOBJECT(this),    TQT_SLOT(slotHint()),     actionCollection(),
+  KStdGameAction::load(this,    TQT_SLOT(slotOpenGame()), actionCollection());
+  KStdGameAction::save(this,    TQT_SLOT(slotSave()),     actionCollection());
+  KStdGameAction::quit(this,    TQT_SLOT(close()),        actionCollection());
+  KStdGameAction::hint(this,    TQT_SLOT(slotHint()),     actionCollection(),
 		       "game_hint");
-  KStdGameAction::undo(TQT_TQOBJECT(this),    TQT_SLOT(slotUndo()),     actionCollection(),
+  KStdGameAction::undo(this,    TQT_SLOT(slotUndo()),     actionCollection(),
 		       "game_undo");
 
   // Non-standard Game Actions: Stop, Continue, Switch sides
   stopAction = new TDEAction(i18n("&Stop Thinking"), "game_stop", TQt::Key_Escape,
-			   TQT_TQOBJECT(this), TQT_SLOT(slotInterrupt()), actionCollection(),
+			   this, TQT_SLOT(slotInterrupt()), actionCollection(),
 			   "game_stop");
   continueAction = new TDEAction(i18n("&Continue Thinking"), "reload", 0,
-			       TQT_TQOBJECT(this), TQT_SLOT(slotContinue()), actionCollection(),
+			       this, TQT_SLOT(slotContinue()), actionCollection(),
 			       "game_continue");
   new TDEAction(i18n("S&witch Sides"), 0, 0,
-	      TQT_TQOBJECT(this), TQT_SLOT(slotSwitchSides()), actionCollection(),
+	      this, TQT_SLOT(slotSwitchSides()), actionCollection(),
 	      "game_switch_sides");
 
   // Some more standard game actions: Highscores, Settings.
-  KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(showHighScoreDialog()), actionCollection());
-  KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotEditSettings()), actionCollection());
+  KStdGameAction::highscores(this, TQT_SLOT(showHighScoreDialog()), actionCollection());
+  KStdAction::preferences(this, TQT_SLOT(slotEditSettings()), actionCollection());
 
   // Actions for the view(s).
   showLastMoveAction = new TDEToggleAction(i18n("Show Last Move"), "lastmoves", 0, 
-					 TQT_TQOBJECT(this), TQT_SLOT(slotShowLastMove()),
+					 this, TQT_SLOT(slotShowLastMove()),
 					 actionCollection(),
 					 "show_last_move");
   showLegalMovesAction = new TDEToggleAction(i18n("Show Legal Moves"), "legalmoves", 0, 
-					   TQT_TQOBJECT(this), TQT_SLOT(slotShowLegalMoves()),
+					   this, TQT_SLOT(slotShowLegalMoves()),
 					   actionCollection(),
 					   "show_legal_moves");
 }
@@ -755,7 +755,7 @@ void KReversi::slotEditSettings()
   Settings      *general = new Settings(0, "General");
 
   dialog->addPage(general, i18n("General"), "package_settings");
-  connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(loadSettings()));
+  connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(loadSettings()));
   dialog->show();
 }
 
diff --git a/kreversi/kzoommainwindow.cpp b/kreversi/kzoommainwindow.cpp
index f8c3c490..10953a2d 100644
--- a/kreversi/kzoommainwindow.cpp
+++ b/kreversi/kzoommainwindow.cpp
@@ -34,11 +34,11 @@ KZoomMainWindow::KZoomMainWindow(uint min, uint max, uint step,
   installEventFilter(this);
   
   m_zoomInAction = 
-    KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT(zoomIn()), actionCollection());
+    KStdAction::zoomIn(this, TQT_SLOT(zoomIn()), actionCollection());
   m_zoomOutAction =
-    KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT(zoomOut()), actionCollection());
+    KStdAction::zoomOut(this, TQT_SLOT(zoomOut()), actionCollection());
   m_menu =
-    KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(toggleMenubar()), actionCollection());
+    KStdAction::showMenubar(this, TQT_SLOT(toggleMenubar()), actionCollection());
 }