Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

3 files changed, 20 insertions, 20 deletions

diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp
index 371ccb4c..03dabbdf 100644
--- a/khangman/khangman/khangman.cpp
+++ b/khangman/khangman/khangman.cpp
@@ -74,30 +74,30 @@ KHangMan::~KHangMan()
 void KHangMan::setupActions()
 {
     // Game->New
-    TDEAction *action = new TDEAction(i18n("&New"), "document-new", CTRL+Key_N , m_view, TQT_SLOT(slotNewGame()), actionCollection(), "file_new");
+    TDEAction *action = new TDEAction(i18n("&New"), "document-new", CTRL+Key_N , m_view, TQ_SLOT(slotNewGame()), actionCollection(), "file_new");
     action->setToolTip(i18n( "Play with a new word" ));
 
     // Game->Get Words in New Language
-    new TDEAction( i18n("&Get Words in New Language..."), "knewstuff", CTRL+Key_G, this, TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" );
+    new TDEAction( i18n("&Get Words in New Language..."), "knewstuff", CTRL+Key_G, this, TQ_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" );
 
-    KStdAction::quit(this, TQT_SLOT(slotQuit()), actionCollection());
+    KStdAction::quit(this, TQ_SLOT(slotQuit()), actionCollection());
     
     m_levelAction = new TDESelectAction(i18n("Le&vel"), 0,  actionCollection(), "combo_level");
     m_levelAction->setToolTip(i18n( "Choose the level" ));
     m_levelAction->setWhatsThis(i18n( "Choose the level of difficulty" ));
-	connect(m_levelAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLevel(int)));
+	connect(m_levelAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChangeLevel(int)));
 
     // Action for selecting language.
     m_languageAction = new TDESelectAction(i18n("&Language"), 0, actionCollection(), "languages");
     m_languageAction->setItems(m_languageNames);
     m_languageAction->setCurrentItem(m_languages.findIndex(Prefs::selectedLanguage()));
-    connect(m_languageAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLanguage(int)));
+    connect(m_languageAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChangeLanguage(int)));
     
-    KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
+    KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection());
 
     // Mode. Currently hard coded into Sea and Desert themes.
     TQStringList modes;
-    m_modeAction = new TDESelectAction(i18n("L&ook"), 0, this, TQT_SLOT(slotChangeMode()),  actionCollection(), "combo_mode");
+    m_modeAction = new TDESelectAction(i18n("L&ook"), 0, this, TQ_SLOT(slotChangeMode()),  actionCollection(), "combo_mode");
     modes += i18n("&Sea Theme");
     modes += i18n("&Desert Theme");
     m_modeAction->setItems(modes);
@@ -382,7 +382,7 @@ void KHangMan::optionsPreferences()
     Timer *m_timer = new Timer();
     dialog->addPage(m_timer, i18n("Timers"), "clock");
 
-    connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(updateSettings()));
+    connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(updateSettings()));
 
     dialog->show();
 }
@@ -457,8 +457,8 @@ void KHangMan::loadLangToolBar()
 
 	for (int i=0; i<(int) m_allData.count(); i++)
 	    secondToolbar->insertButton (charIcon(m_allData[i].at(0)), i, 
-					 TQT_SIGNAL( clicked() ), this, 
-					 TQT_SLOT( slotPasteChar()), true,  
+					 TQ_SIGNAL( clicked() ), this, 
+					 TQ_SLOT( slotPasteChar()), true,  
 					 i18n("Inserts the character %1").arg(m_allData[i]), i+1 );
     }
 
diff --git a/khangman/khangman/khangmanview.cpp b/khangman/khangman/khangmanview.cpp
index 69831919..dc8864c8 100644
--- a/khangman/khangman/khangmanview.cpp
+++ b/khangman/khangman/khangmanview.cpp
@@ -77,10 +77,10 @@ KHangManView::KHangManView(KHangMan*parent, const char *name)
     m_accentedLetters  = true;
     m_hintExists       = true;	// Assume hint exists
 
-    connect( m_letterInput, TQT_SIGNAL( returnPressed() ),
-	     this,          TQT_SLOT( slotTry() ) );
-    connect( m_guessButton, TQT_SIGNAL( clicked() ),
-	     this,          TQT_SLOT( slotTry() ));
+    connect( m_letterInput, TQ_SIGNAL( returnPressed() ),
+	     this,          TQ_SLOT( slotTry() ) );
+    connect( m_guessButton, TQ_SIGNAL( clicked() ),
+	     this,          TQ_SLOT( slotTry() ));
 }
 
 
@@ -429,7 +429,7 @@ void KHangManView::slotTry()
 		    y = abspos.y() + height()*20/535;
 		    point = TQPoint(x, y);
 		    popup->show(mapToGlobal(point));
-		    TQTimer::singleShot( 4*1000, this, TQT_SLOT(slotNewGame()) );
+		    TQTimer::singleShot( 4*1000, this, TQ_SLOT(slotNewGame()) );
 		}
 		else if (KMessageBox::questionYesNo(this, i18n("Congratulations! You won! Do you want to play again?"),TQString(),i18n("Play Again"), i18n("Do Not Play")) == 3)
 		    slotNewGame();
@@ -475,7 +475,7 @@ void KHangManView::slotTry()
 		    int  y = abspos.y() + height() * 20 / 535;
 		    popup->show(mapToGlobal(TQPoint(x, y)));
 
-		    TQTimer::singleShot( 4 * 1000, this, TQT_SLOT(slotNewGame()) );
+		    TQTimer::singleShot( 4 * 1000, this, TQ_SLOT(slotNewGame()) );
 		}
 		else if (KMessageBox::questionYesNo(this, newGameString, TQString(), i18n("Play Again"), i18n("Do Not Play")) == 3)
 		    slotNewGame();
@@ -507,7 +507,7 @@ void KHangManView::slotTry()
 	    // Create a 1 second single-shot timer, and reenable user
 	    // input after this time.
 	    TQTimer::singleShot( Prefs::missedTimer() * 1000, 
-				this, TQT_SLOT(enableUserInput()) );
+				this, TQ_SLOT(enableUserInput()) );
 
 	    // Disable any possible entry
 	    m_letterInput->setEnabled(false);
@@ -528,7 +528,7 @@ void KHangManView::slotTry()
 	    point = TQPoint(x, y);
 
 	    TQTimer::singleShot( Prefs::missedTimer() * 1000,
-				this, TQT_SLOT(enableUserInput()) );
+				this, TQ_SLOT(enableUserInput()) );
 
 	    // Disable any possible entry
 	    m_letterInput->setEnabled(false);	
diff --git a/khangman/khangman/timer.cpp b/khangman/khangman/timer.cpp
index 64fe60a7..21386035 100644
--- a/khangman/khangman/timer.cpp
+++ b/khangman/khangman/timer.cpp
@@ -32,8 +32,8 @@ Timer::Timer()
 {
     timeHintLabel->setText(TQString::number(Prefs::hintTimer()) + " " + i18n("seconds"));
     timeMissedLabel->setText(TQString::number(Prefs::missedTimer()) + " " + i18n("seconds"));
-    connect(kcfg_HintTimer, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(sliderValueChanged()));
-    connect(kcfg_MissedTimer, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(sliderValueChanged()));
+    connect(kcfg_HintTimer, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(sliderValueChanged()));
+    connect(kcfg_MissedTimer, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(sliderValueChanged()));
 }