Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

2 files changed, 21 insertions, 21 deletions

diff --git a/kshisen/app.cpp b/kshisen/app.cpp
index 8717e70d..5862f789 100644
--- a/kshisen/app.cpp
+++ b/kshisen/app.cpp
@@ -89,13 +89,13 @@ App::App(TQWidget *parent, const char *name) : TDEMainWindow(parent, name),
 
 	setupGUI();
 
-	connect(board, TQT_SIGNAL(changed()), this, TQT_SLOT(enableItems()));
+	connect(board, TQ_SIGNAL(changed()), this, TQ_SLOT(enableItems()));
 
 	TQTimer *t = new TQTimer(this);
 	t->start(1000);
-	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()));
+	connect(t, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateScore()));
+	connect(board, TQ_SIGNAL(endOfGame()), this, TQ_SLOT(slotEndOfGame()));
+	connect(board, TQ_SIGNAL(resized()), this, TQ_SLOT(boardResized()));
 
 	kapp->processEvents();
 
@@ -106,25 +106,25 @@ App::App(TQWidget *parent, const char *name) : TDEMainWindow(parent, name),
 void App::initTDEAction()
 {
 	// Game
-	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());
+	KStdGameAction::gameNew(this, TQ_SLOT(newGame()), actionCollection());
+	KStdGameAction::restart(this, TQ_SLOT(restartGame()), actionCollection());
+	KStdGameAction::pause(this, TQ_SLOT(pause()), actionCollection());
+	KStdGameAction::highscores(this, TQ_SLOT(hallOfFame()), actionCollection());
+	KStdGameAction::quit(this, TQ_SLOT(quitGame()), actionCollection());
 
 	// Move
-	KStdGameAction::undo(this, TQT_SLOT(undo()), actionCollection());
-	KStdGameAction::redo(this, TQT_SLOT(redo()), actionCollection());
-	KStdGameAction::hint(this, TQT_SLOT(hint()), actionCollection());
+	KStdGameAction::undo(this, TQ_SLOT(undo()), actionCollection());
+	KStdGameAction::redo(this, TQ_SLOT(redo()), actionCollection());
+	KStdGameAction::hint(this, TQ_SLOT(hint()), actionCollection());
 	//new TDEAction(i18n("Is Game Solvable?"), 0, this,
-	//	TQT_SLOT(isSolvable()), actionCollection(), "move_solvable");
+	//	TQ_SLOT(isSolvable()), actionCollection(), "move_solvable");
 
 #ifdef DEBUGGING
-	(void)new TDEAction(i18n("&Finish"), 0, board, TQT_SLOT(finish()), actionCollection(), "move_finish");
+	(void)new TDEAction(i18n("&Finish"), 0, board, TQ_SLOT(finish()), actionCollection(), "move_finish");
 #endif
 
 	// Settings
-	KStdAction::preferences(this, TQT_SLOT(showSettings()), actionCollection());
+	KStdAction::preferences(this, TQ_SLOT(showSettings()), actionCollection());
 }
 
 void App::hallOfFame()
@@ -372,8 +372,8 @@ TQString App::getPlayerName()
 	b->setDefault(true);
 	b->setFixedSize(b->sizeHint());
 
-	connect(b, TQT_SIGNAL(released()), dlg, TQT_SLOT(accept()));
-	connect(e, TQT_SIGNAL(returnPressed()), dlg, TQT_SLOT(accept()));
+	connect(b, TQ_SIGNAL(released()), dlg, TQ_SLOT(accept()));
+	connect(e, TQ_SIGNAL(returnPressed()), dlg, TQ_SLOT(accept()));
 
 	// create layout
 	TQVBoxLayout *tl = new TQVBoxLayout(dlg, 10);
@@ -723,7 +723,7 @@ void App::showHighscore(int focusitem)
 	b->setFixedSize(b->sizeHint());
 
 	// connect the "Close"-button to done
-	connect(b, TQT_SIGNAL(clicked()), dlg, TQT_SLOT(accept()));
+	connect(b, TQ_SIGNAL(clicked()), dlg, TQ_SLOT(accept()));
 	b->setDefault(true);
 	b->setFocus();
 
@@ -752,8 +752,8 @@ 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()), this, TQT_SLOT(loadSettings()));
-	connect(dialog, TQT_SIGNAL(settingsChanged()), board, TQT_SLOT(loadSettings()));
+	connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(loadSettings()));
+	connect(dialog, TQ_SIGNAL(settingsChanged()), board, TQ_SLOT(loadSettings()));
 	dialog->show();
 }
 
diff --git a/kshisen/board.cpp b/kshisen/board.cpp
index 3b224718..2501f2b1 100644
--- a/kshisen/board.cpp
+++ b/kshisen/board.cpp
@@ -683,7 +683,7 @@ void Board::drawConnection(int timeout)
 	p.flush();
 	p.end();
 
-	TQTimer::singleShot(timeout, this, TQT_SLOT(undrawConnection()));
+	TQTimer::singleShot(timeout, this, TQ_SLOT(undrawConnection()));
 }
 
 void Board::undrawConnection()