Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

3 files changed, 23 insertions, 23 deletions

diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp
index fb67b82f..f9c17cb8 100644
--- a/klettres/klettres/klettres.cpp
+++ b/klettres/klettres/klettres.cpp
@@ -195,16 +195,16 @@ bool KLettres::loadLayout(TQDomDocument &layoutDocument)
 
 void KLettres::setupActions()
 {
-    TDEAction *m_newAction = new TDEAction(i18n("New Sound"), "file_new", CTRL+Key_N, m_view, TQT_SLOT(game()), actionCollection(), "play_new");
+    TDEAction *m_newAction = new TDEAction(i18n("New Sound"), "file_new", CTRL+Key_N, m_view, TQ_SLOT(game()), actionCollection(), "play_new");
     m_newAction->setToolTip(i18n("Play a new sound"));
     m_newAction->setWhatsThis(i18n("You can play a new sound by clicking this button or using the File menu, New Sound.")); 
-    new TDEAction( i18n("Get Alphabet in New Language..."), "knewstuff", 0, this, TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" );
-    TDEAction *m_playAgainAction = new TDEAction(i18n("Replay Sound"),"media-playback-start", CTRL+Key_P, m_view, TQT_SLOT(slotPlayAgain()), actionCollection(), "play_again");
+    new TDEAction( i18n("Get Alphabet in New Language..."), "knewstuff", 0, this, TQ_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" );
+    TDEAction *m_playAgainAction = new TDEAction(i18n("Replay Sound"),"media-playback-start", CTRL+Key_P, m_view, TQ_SLOT(slotPlayAgain()), actionCollection(), "play_again");
     m_playAgainAction->setToolTip(i18n("Play the same sound again"));
     m_playAgainAction->setWhatsThis(i18n("You can replay the same sound again by clicking this button or using the File menu, Replay Sound."));
-    KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+    KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
 
-    m_menubarAction = new TDEToggleAction(i18n("Show &Menubar"),"edit-clear", CTRL+Key_M, this, TQT_SLOT(slotMenubar()), actionCollection(), "menubar");
+    m_menubarAction = new TDEToggleAction(i18n("Show &Menubar"),"edit-clear", CTRL+Key_M, this, TQ_SLOT(slotMenubar()), actionCollection(), "menubar");
     m_menubarAction->setCheckedState(i18n("Hide &Menubar"));
     m_menubarAction->setChecked(true);
     m_menubarAction->setWhatsThis(i18n("You can show or hide the menubar as you wish by clicking this button."));
@@ -230,16 +230,16 @@ void KLettres::setupActions()
     m_themeAction->setToolTip(i18n("Select the theme"));
     m_themeAction->setWhatsThis(i18n("Here you can change the theme for KLettres. A theme consists in the background picture and the font color for the letter displayed."));
 
-    m_kidAction = new TDEToggleAction(i18n("Mode Kid"), "klettres_kids", CTRL+Key_K, this, TQT_SLOT(slotModeKid()), actionCollection(), "mode_kid");
+    m_kidAction = new TDEToggleAction(i18n("Mode Kid"), "klettres_kids", CTRL+Key_K, this, TQ_SLOT(slotModeKid()), actionCollection(), "mode_kid");
     m_kidAction->setWhatsThis(i18n("If you are in the Grown-up mode, clicking on this button will set up the Kid mode. The Kid mode has no menubar and the font is bigger in the statusbar."));
-    m_grownupAction = new TDEToggleAction(i18n("Mode Grown-up"), "klettres_grownup", CTRL+Key_G, this, TQT_SLOT(slotModeGrownup()), actionCollection(), "mode_grownup");
+    m_grownupAction = new TDEToggleAction(i18n("Mode Grown-up"), "klettres_grownup", CTRL+Key_G, this, TQ_SLOT(slotModeGrownup()), actionCollection(), "mode_grownup");
     m_grownupAction->setWhatsThis(i18n("The Grown-up mode is the normal mode where you can see the menubar."));
 
-    connect(m_levelAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLevel(int)));
-    connect(m_languageAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLanguage(int)));
-    connect(m_themeAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeTheme(int)));
+    connect(m_levelAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChangeLevel(int)));
+    connect(m_languageAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChangeLanguage(int)));
+    connect(m_themeAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChangeTheme(int)));
 
-    KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
+    KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection());
 
     setupGUI();
 }
@@ -273,7 +273,7 @@ void KLettres::optionsPreferences()
     //fonts is the icon
     Timer *m_timer = new Timer();
     dialog->addPage(m_timer, i18n("Timer"), "clock");
-    connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotUpdateSettings()));
+    connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotUpdateSettings()));
     dialog->show();
 }
 
@@ -475,7 +475,7 @@ void KLettres::loadLangToolBar()
         openFileStream.close();
         for (int i=0; i<(int) allData.count(); i++) {
             if (!allData[i].isEmpty())
-                m_secondToolbar->insertButton (charIcon(allData[i].at(0)), i, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotPasteChar()), true,  i18n("Inserts the character %1").arg(allData[i]), i+1 );
+                m_secondToolbar->insertButton (charIcon(allData[i].at(0)), i, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotPasteChar()), true,  i18n("Inserts the character %1").arg(allData[i]), i+1 );
         }
     }
 }
diff --git a/klettres/klettres/klettresview.cpp b/klettres/klettres/klettresview.cpp
index 69cc6bcc..6cdf78a7 100644
--- a/klettres/klettres/klettresview.cpp
+++ b/klettres/klettres/klettresview.cpp
@@ -124,24 +124,24 @@ void KLettresView::game()
     m_cursorPos = 1;
     //reset everything so when you change language or levels
     //it all restarts nicely
-    TQObject::disconnect(m_letterEdit, TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(slotProcess(const TQString&)) );
+    TQObject::disconnect(m_letterEdit, TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(slotProcess(const TQString&)) );
     m_letterEdit->clear();
     m_letterEdit->setCursorPosition(0);
     m_letterEdit->setMaxLength(1); //fix that's in trunk
     m_letterEdit->setFocus();
     chooseSound();
-    TQObject::connect(m_letterEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotProcess(const TQString&)) );
+    TQObject::connect(m_letterEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotProcess(const TQString&)) );
 }
 
 void KLettresView::slotProcess(const TQString &inputLetter)
 {
-    TQObject::disconnect(m_letterEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotProcess(const TQString&)) );
+    TQObject::disconnect(m_letterEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotProcess(const TQString&)) );
     //check if backspace
     if(inputLetter.length() != m_cursorPos)
     {
         m_cursorPos--;
         m_letterEdit->setMaxLength( m_cursorPos );
-        TQObject::connect(m_letterEdit, TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(slotProcess(const TQString&)) );
+        TQObject::connect(m_letterEdit, TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(slotProcess(const TQString&)) );
         return;
     }
 
@@ -153,14 +153,14 @@ void KLettresView::slotProcess(const TQString &inputLetter)
         m_letterEdit->selectAll();
         m_letterEdit->cut();
         m_letterEdit->setText(m_upperLetter);
-        TQTimer::singleShot(m_timer*100, this, TQT_SLOT(slotTimerDone()));
+        TQTimer::singleShot(m_timer*100, this, TQ_SLOT(slotTimerDone()));
     }
     else
     {
         kdDebug() << "in no char loop" << endl;
         kdDebug() << "cursor " << m_cursorPos << endl;
         m_letterEdit->backspace();
-        TQObject::connect(m_letterEdit, TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(slotProcess(const TQString&)) );
+        TQObject::connect(m_letterEdit, TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(slotProcess(const TQString&)) );
     }
 }
 
@@ -177,7 +177,7 @@ void KLettresView::slotTimerDone()
             m_letterEdit->setCursorPosition( m_cursorPos );
             m_letterEdit->setFocus();
             m_cursorPos ++;
-            TQObject::connect(m_letterEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotProcess(const TQString&)) );
+            TQObject::connect(m_letterEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotProcess(const TQString&)) );
         }
         else
         {
@@ -191,7 +191,7 @@ void KLettresView::slotTimerDone()
         //play sound again
         m_klettres->soundFactory->playSound(m_random);
 
-        TQObject::connect(m_letterEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotProcess(const TQString&)) );
+        TQObject::connect(m_letterEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotProcess(const TQString&)) );
     }
 }
 
diff --git a/klettres/klettres/timer.cpp b/klettres/klettres/timer.cpp
index d6fa9a4b..6b7e06d6 100644
--- a/klettres/klettres/timer.cpp
+++ b/klettres/klettres/timer.cpp
@@ -34,8 +34,8 @@ Timer::Timer()
 {
     timeGrownLabel->setText(TQString::number(Prefs::grownTimer()) + " " + i18n("tenths of second"));
     timeKidLabel->setText(TQString::number(Prefs::kidTimer()) + " " + i18n("tenths of second"));
-    connect(kcfg_GrownTimer, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(sliderValueChanged()));
-    connect(kcfg_KidTimer, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(sliderValueChanged()));
+    connect(kcfg_GrownTimer, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(sliderValueChanged()));
+    connect(kcfg_KidTimer, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(sliderValueChanged()));
 }