Replace various '#define' strings - part 6

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

1 files changed, 15 insertions, 15 deletions

diff --git a/kshisen/app.cpp b/kshisen/app.cpp
index ae3e7f94..8717e70d 100644
--- a/kshisen/app.cpp
+++ b/kshisen/app.cpp
@@ -65,7 +65,7 @@
 App::App(TQWidget *parent, const char *name) : TDEMainWindow(parent, name),
    hintmode(false)
 {
-	highscoreTable = new KHighscore(TQT_TQOBJECT(this));
+	highscoreTable = new KHighscore(this);
 
 	// TODO?
 	// Would it make sense long term to have a tdeconfig update rather then
@@ -89,13 +89,13 @@ App::App(TQWidget *parent, const char *name) : TDEMainWindow(parent, name),
 
 	setupGUI();
 
-	connect(board, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(enableItems()));
+	connect(board, TQT_SIGNAL(changed()), this, TQT_SLOT(enableItems()));
 
 	TQTimer *t = new TQTimer(this);
 	t->start(1000);
-	connect(t, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(updateScore()));
-	connect(board, TQT_SIGNAL(endOfGame()), TQT_TQOBJECT(this), TQT_SLOT(slotEndOfGame()));
-	connect(board, TQT_SIGNAL(resized()), TQT_TQOBJECT(this), TQT_SLOT(boardResized()));
+	connect(t, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateScore()));
+	connect(board, TQT_SIGNAL(endOfGame()), this, TQT_SLOT(slotEndOfGame()));
+	connect(board, TQT_SIGNAL(resized()), this, TQT_SLOT(boardResized()));
 
 	kapp->processEvents();
 
@@ -106,16 +106,16 @@ App::App(TQWidget *parent, const char *name) : TDEMainWindow(parent, name),
 void App::initTDEAction()
 {
 	// Game
-	KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(newGame()), actionCollection());
-	KStdGameAction::restart(TQT_TQOBJECT(this), TQT_SLOT(restartGame()), actionCollection());
-	KStdGameAction::pause(TQT_TQOBJECT(this), TQT_SLOT(pause()), actionCollection());
-	KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(hallOfFame()), actionCollection());
-	KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quitGame()), actionCollection());
+	KStdGameAction::gameNew(this, TQT_SLOT(newGame()), actionCollection());
+	KStdGameAction::restart(this, TQT_SLOT(restartGame()), actionCollection());
+	KStdGameAction::pause(this, TQT_SLOT(pause()), actionCollection());
+	KStdGameAction::highscores(this, TQT_SLOT(hallOfFame()), actionCollection());
+	KStdGameAction::quit(this, TQT_SLOT(quitGame()), actionCollection());
 
 	// Move
-	KStdGameAction::undo(TQT_TQOBJECT(this), TQT_SLOT(undo()), actionCollection());
-	KStdGameAction::redo(TQT_TQOBJECT(this), TQT_SLOT(redo()), actionCollection());
-	KStdGameAction::hint(TQT_TQOBJECT(this), TQT_SLOT(hint()), actionCollection());
+	KStdGameAction::undo(this, TQT_SLOT(undo()), actionCollection());
+	KStdGameAction::redo(this, TQT_SLOT(redo()), actionCollection());
+	KStdGameAction::hint(this, TQT_SLOT(hint()), actionCollection());
 	//new TDEAction(i18n("Is Game Solvable?"), 0, this,
 	//	TQT_SLOT(isSolvable()), actionCollection(), "move_solvable");
 
@@ -124,7 +124,7 @@ void App::initTDEAction()
 #endif
 
 	// Settings
-	KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection());
+	KStdAction::preferences(this, TQT_SLOT(showSettings()), actionCollection());
 }
 
 void App::hallOfFame()
@@ -752,7 +752,7 @@ void App::showSettings(){
 	TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Prefs::self(), KDialogBase::Swallow);
 	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()));
 	connect(dialog, TQT_SIGNAL(settingsChanged()), board, TQT_SLOT(loadSettings()));
 	dialog->show();
 }