Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 69e4de2f4cee257151ca13b207dc677b2d958fed)

6 files changed, 43 insertions, 43 deletions

diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp
index 10752cb2..b10dd9f8 100644
--- a/ktouch/src/ktouch.cpp
+++ b/ktouch/src/ktouch.cpp
@@ -431,16 +431,16 @@ void KTouch::optionsPreferences() {
 	dialog->addPage(m_pageKeyboard, i18n("Keyboard Settings"), "keyboard_layout");
 	m_pageColors = new KTouchPrefColorsLayout(0, "Colors"); 
 	dialog->addPage(m_pageColors, i18n("Color Settings"), "applications-graphics");
-	connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(applyPreferences()));
+	connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(applyPreferences()));
 	// TODO : Connect some other buttons/check boxes of the dialog
-	connect(m_pageGeneral->kcfg_OverrideLectureFont, TQT_SIGNAL(toggled(bool)), 
-		this, TQT_SLOT(configOverrideLectureFontToggled(bool)));
-	connect(m_pageKeyboard->kcfg_OverrideKeyboardFont, TQT_SIGNAL(toggled(bool)), 
-		this, TQT_SLOT(configOverrideKeyboardFontToggled(bool)));
-	connect(m_pageTraining->kcfg_AutoLevelChange, TQT_SIGNAL(toggled(bool)), 
-		this, TQT_SLOT(configAutoLevelChangeToggled(bool)));
-	connect(m_pageColors->kcfg_CommonTypingLineColors, TQT_SIGNAL(toggled(bool)),
-		this, TQT_SLOT(configCommonColorsToggled(bool)));
+	connect(m_pageGeneral->kcfg_OverrideLectureFont, TQ_SIGNAL(toggled(bool)), 
+		this, TQ_SLOT(configOverrideLectureFontToggled(bool)));
+	connect(m_pageKeyboard->kcfg_OverrideKeyboardFont, TQ_SIGNAL(toggled(bool)), 
+		this, TQ_SLOT(configOverrideKeyboardFontToggled(bool)));
+	connect(m_pageTraining->kcfg_AutoLevelChange, TQ_SIGNAL(toggled(bool)), 
+		this, TQ_SLOT(configAutoLevelChangeToggled(bool)));
+	connect(m_pageColors->kcfg_CommonTypingLineColors, TQ_SIGNAL(toggled(bool)),
+		this, TQ_SLOT(configCommonColorsToggled(bool)));
 	// call the functions to enable/disable controls depending on settings
 	configOverrideLectureFontToggled(Prefs::overrideLectureFont());
 	configOverrideKeyboardFontToggled(Prefs::overrideKeyboardFont());
@@ -684,37 +684,37 @@ void KTouch::initTrainingSession() {
 void KTouch::setupActions() {
 	// *** File menu ***
     new TDEAction(i18n("&Open lecture..."), "open_lecture", 0,
-		this, TQT_SLOT(fileOpenLecture()), actionCollection(), "file_openlecture");
+		this, TQ_SLOT(fileOpenLecture()), actionCollection(), "file_openlecture");
     new TDEAction(i18n("&Edit lecture..."), "edit_lecture", 0,
-		this, TQT_SLOT(fileEditLecture()), actionCollection(), "file_editlecture");
+		this, TQ_SLOT(fileEditLecture()), actionCollection(), "file_editlecture");
     new TDEAction(i18n("&Edit color scheme..."), "edit_colors", 0,
-		this, TQT_SLOT(fileEditColors()), actionCollection(), "file_editcolors");
+		this, TQ_SLOT(fileEditColors()), actionCollection(), "file_editcolors");
 //    new TDEAction(i18n("&Edit Keyboard..."), "edit_keyboard", 0, 
-//		this, TQT_SLOT(fileEditKeyboard()), actionCollection(), "file_editkeyboard");
-    KStdAction::quit(this, TQT_SLOT(fileQuit()), actionCollection());
+//		this, TQ_SLOT(fileEditKeyboard()), actionCollection(), "file_editkeyboard");
+    KStdAction::quit(this, TQ_SLOT(fileQuit()), actionCollection());
 
 	// *** Training menu ***
     new TDEAction(i18n("&Start New Session"), "launch", 0,
-        this, TQT_SLOT(trainingNewSession()), actionCollection(), "training_newsession");
+        this, TQ_SLOT(trainingNewSession()), actionCollection(), "training_newsession");
     m_trainingPause = new TDEAction(i18n("&Pause Session"), "media-playback-pause", 0,
-        this, TQT_SLOT(trainingPause()), actionCollection(), "training_pause");
+        this, TQ_SLOT(trainingPause()), actionCollection(), "training_pause");
     new TDEAction(i18n("&Lecture Statistics"), "kalarm", 0,
-        this, TQT_SLOT(trainingStatistics()), actionCollection(), "training_stats");
+        this, TQ_SLOT(trainingStatistics()), actionCollection(), "training_stats");
  
     // Setup menu entries for the training lectures
     m_defaultLectureAction = new TDESelectAction(i18n("Default &Lectures"), 0, this, 0, actionCollection(), "default_lectures");
 	m_defaultLectureAction->setMenuAccelsEnabled(false);
     m_defaultLectureAction->setItems(m_lectureTitles);
     m_defaultLectureAction->setCurrentItem(0);  
-    connect (m_defaultLectureAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changeLecture(int)));
+    connect (m_defaultLectureAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changeLecture(int)));
 
 	// *** Settings menu ***    
-    KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
+    KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection());
     // Setup menu entries for keyboard layouts    
     m_keyboardLayoutAction= new TDESelectAction(i18n("&Keyboard Layouts"), 0, this, 0, actionCollection(), "keyboard_layouts");
 	m_keyboardLayoutAction->setMenuAccelsEnabled(false);
     m_keyboardLayoutAction->setItems(m_keyboardTitles);
-    connect (m_keyboardLayoutAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changeKeyboard(int)));
+    connect (m_keyboardLayoutAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changeKeyboard(int)));
 
 	// Setup menu entries for colour schemes
 	m_keyboardColorAction = new TDESelectAction(i18n("&Color Schemes"), 0, this, 0, actionCollection(), "keyboard_schemes");
@@ -726,7 +726,7 @@ void KTouch::setupActions() {
 	if (static_cast<unsigned int>(Prefs::currentColorScheme()) >=  schemes_list.count())
 		Prefs::setCurrentColorScheme(1);
    	m_keyboardColorAction->setCurrentItem(Prefs::currentColorScheme());
-    connect (m_keyboardColorAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changeColor(int)));
+    connect (m_keyboardColorAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changeColor(int)));
 }
 // ----------------------------------------------------------------------------
 
diff --git a/ktouch/src/ktouchlectureeditor.cpp b/ktouch/src/ktouchlectureeditor.cpp
index 513a740a..66f6aead 100644
--- a/ktouch/src/ktouchlectureeditor.cpp
+++ b/ktouch/src/ktouchlectureeditor.cpp
@@ -46,18 +46,18 @@ KTouchLectureEditor::KTouchLectureEditor(TQWidget *parent, const char* name, boo
 {
     levelListView->setSorting(-1); // don't sort my level list view!
 
-    connect(levelListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),this, TQT_SLOT(newSelection(TQListViewItem*)) );
-    connect(newCharsEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(newCharsChanged(const TQString&)) );
-    connect(newBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(newLevel()) );
-    connect(deleteBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteLevel()) );
-    connect(upBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveUp()) );
-    connect(downBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveDown()) );
+    connect(levelListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)),this, TQ_SLOT(newSelection(TQListViewItem*)) );
+    connect(newCharsEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(newCharsChanged(const TQString&)) );
+    connect(newBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(newLevel()) );
+    connect(deleteBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteLevel()) );
+    connect(upBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveUp()) );
+    connect(downBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveDown()) );
 
     // make the connections for making the lecture modified
-    connect(titleEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(setModified()) );
-    connect(lectureCommentEdit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setModified()) );
-    connect(levelCommentEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(setModified()) );
-    connect(linesTextEdit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setModified()) );
+    connect(titleEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(setModified()) );
+    connect(lectureCommentEdit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(setModified()) );
+    connect(levelCommentEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(setModified()) );
+    connect(linesTextEdit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(setModified()) );
     
     // The font, open, save, saveas and close buttons are already connected
 }
diff --git a/ktouch/src/ktouchslideline.cpp b/ktouch/src/ktouchslideline.cpp
index 5ed89201..366fbd77 100644
--- a/ktouch/src/ktouchslideline.cpp
+++ b/ktouch/src/ktouchslideline.cpp
@@ -77,8 +77,8 @@ KTouchSlideLine::KTouchSlideLine(TQWidget *parent)
     m_xFrameStudent = 0;  
     m_xFrameStudentCurrent = 0;
 
-    connect( &m_cursorTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(toggleCursor()) );
-    connect( &m_slideTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slide()) );
+    connect( &m_cursorTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(toggleCursor()) );
+    connect( &m_slideTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slide()) );
 }
 // ----------------------------------------------------------------------------
 
diff --git a/ktouch/src/ktouchstatistics.cpp b/ktouch/src/ktouchstatistics.cpp
index 0cfdeb2e..488ab6b0 100644
--- a/ktouch/src/ktouchstatistics.cpp
+++ b/ktouch/src/ktouchstatistics.cpp
@@ -40,13 +40,13 @@ KTouchStatistics::KTouchStatistics(TQWidget* parent)
 	sessionsRadio->setChecked(true);
 	WPMRadio->setChecked(true);
 	eventRadio->setChecked(true);
-    connect(closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
-	connect(lectureCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(lectureActivated(int)) );
-    connect(clearButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearHistory()) );
+    connect(closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) );
+	connect(lectureCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(lectureActivated(int)) );
+    connect(clearButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearHistory()) );
 	// connect the radio buttons with the chart update function
-    connect(buttonGroup1, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(updateChartTab()) );
-    connect(buttonGroup2, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(updateChartTab()) );
-    connect(buttonGroup3, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(updateChartTab()) );
+    connect(buttonGroup1, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(updateChartTab()) );
+    connect(buttonGroup2, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(updateChartTab()) );
+    connect(buttonGroup3, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(updateChartTab()) );
 	
 	// TODO : temporarily remove detailed stats page and deactivate options
 	levelsRadio->setEnabled(false);
diff --git a/ktouch/src/ktouchtrainer.cpp b/ktouch/src/ktouchtrainer.cpp
index 568e25c5..72fc4980 100644
--- a/ktouch/src/ktouchtrainer.cpp
+++ b/ktouch/src/ktouchtrainer.cpp
@@ -55,9 +55,9 @@ KTouchTrainer::KTouchTrainer(KTouchStatus *status, KTouchSlideLine *slideLine, K
     m_levelDownSound = TDEGlobal::dirs()->findResource("appdata","down.wav");
     m_typeWriterSound = TDEGlobal::dirs()->findResource("appdata","typewriter.wav");
 
-    connect(m_statusWidget->levelUpBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(levelUp()) );
-    connect(m_statusWidget->levelDownBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(levelDown()) );
-    connect(m_trainingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerTick()) );
+    connect(m_statusWidget->levelUpBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(levelUp()) );
+    connect(m_statusWidget->levelDownBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(levelDown()) );
+    connect(m_trainingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timerTick()) );
 }
 // ----------------------------------------------------------------------------
 
diff --git a/ktouch/src/main.cpp b/ktouch/src/main.cpp
index cebc0a0d..0e5ad898 100644
--- a/ktouch/src/main.cpp
+++ b/ktouch/src/main.cpp
@@ -61,7 +61,7 @@ int main(int argc, char **argv)
         splash.setHideEnabled( true );  // allow user to click the splash screen away
         splash.show();                  // show it
         TQTimer splashTimer;
-        splashTimer.connect(&splashTimer, TQT_SIGNAL(timeout()), &splash, TQT_SLOT(hide()));
+        splashTimer.connect(&splashTimer, TQ_SIGNAL(timeout()), &splash, TQ_SLOT(hide()));
         splashTimer.start(2000, true);  // start singleshot timer to hide the splashscreen
         */