Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

8 files changed, 26 insertions, 26 deletions

diff --git a/amarok/src/scripts/alarm/alarm.py b/amarok/src/scripts/alarm/alarm.py
index e515320b..97345e26 100755
--- a/amarok/src/scripts/alarm/alarm.py
+++ b/amarok/src/scripts/alarm/alarm.py
@@ -53,8 +53,8 @@ class ConfigDialog( TQDialog ):
         self.cancel.setText( "Cancel" )
         self.cancel.setDefault( True )
 
-        self.connect( self.ok,     SIGNAL( "clicked()" ), self.save )
-        self.connect( self.cancel, SIGNAL( "clicked()" ), self, SLOT( "reject()" ) )
+        self.connect( self.ok,     TQ_SIGNAL( "clicked()" ), self.save )
+        self.connect( self.cancel, TQ_SIGNAL( "clicked()" ), self, TQ_SLOT( "reject()" ) )
 
         self.adjustSize()
 
@@ -88,7 +88,7 @@ class Alarm( TQApplication ):
         self.t.start()
 
         self.alarmTimer = TQTimer()
-        self.connect( self.alarmTimer, SIGNAL( "timeout()" ), self.wakeup )
+        self.connect( self.alarmTimer, TQ_SIGNAL( "timeout()" ), self.wakeup )
 
         self.readSettings()
 
@@ -148,7 +148,7 @@ class Alarm( TQApplication ):
 
         self.dia = ConfigDialog()
         self.dia.show()
-        self.connect( self.dia, SIGNAL( "destroyed()" ), self.readSettings )
+        self.connect( self.dia, TQ_SIGNAL( "destroyed()" ), self.readSettings )
 
 
 ############################################################################
diff --git a/amarok/src/scripts/amarok_live/amarok_live.py b/amarok/src/scripts/amarok_live/amarok_live.py
index 0a4b58cd..64a39477 100755
--- a/amarok/src/scripts/amarok_live/amarok_live.py
+++ b/amarok/src/scripts/amarok_live/amarok_live.py
@@ -70,13 +70,13 @@ class ConfigDialog ( TQDialog ):
         self.lay.addWidget( self.cancel, 2, 1 )
         self.lay.addWidget( self.ok, 2, 0)
 
-        self.connect( self.isobutton, SIGNAL( "clicked()" ), self.browseISO )
-        self.connect( self.tmpbutton, SIGNAL( "clicked()" ), self.browsePath )
+        self.connect( self.isobutton, TQ_SIGNAL( "clicked()" ), self.browseISO )
+        self.connect( self.tmpbutton, TQ_SIGNAL( "clicked()" ), self.browsePath )
 
-        self.connect( self.ok, SIGNAL( "clicked()" ), self.save )
-        self.connect( self.ok, SIGNAL( "clicked()" ), self.unpack )
-#        self.connect( self.ok, SIGNAL( "clicked()" ), self.destroy )
-        self.connect( self.cancel, SIGNAL( "clicked()" ), self, SLOT("reject()") )
+        self.connect( self.ok, TQ_SIGNAL( "clicked()" ), self.save )
+        self.connect( self.ok, TQ_SIGNAL( "clicked()" ), self.unpack )
+#        self.connect( self.ok, TQ_SIGNAL( "clicked()" ), self.destroy )
+        self.connect( self.cancel, TQ_SIGNAL( "clicked()" ), self, TQ_SLOT("reject()") )
 
         self.adjustSize()
 
@@ -259,7 +259,7 @@ class Remasterer( TQApplication ):
 
         self.dia = ConfigDialog()
         self.dia.show()
-        #self.connect( self.dia, SIGNAL( "destroyed()" ), self.readSettings )
+        #self.connect( self.dia, TQ_SIGNAL( "destroyed()" ), self.readSettings )
 
     def clearCD( self ):
 
diff --git a/amarok/src/scripts/databasescripts/databaseScripts.rb b/amarok/src/scripts/databasescripts/databaseScripts.rb
index efbefc63..663ce063 100644
--- a/amarok/src/scripts/databasescripts/databaseScripts.rb
+++ b/amarok/src/scripts/databasescripts/databaseScripts.rb
@@ -69,12 +69,12 @@ class DatabaseScriptChooser < TQt::Dialog
         @layout2.addWidget(@m_okayButton)
         @layout3.addLayout(@layout2)
 
-        connect( @m_optionCombo,  SIGNAL( "activated(int)" ), self, SLOT( "optionChanged(int)" ) );
-        connect( @m_okayButton,   SIGNAL( "clicked()" ),      self, SLOT( "accept()" ) )
-        connect( @m_cancelButton, SIGNAL( "clicked()" ),      self, SLOT( "cancel()" ) )
+        connect( @m_optionCombo,  TQ_SIGNAL( "activated(int)" ), self, TQ_SLOT( "optionChanged(int)" ) );
+        connect( @m_okayButton,   TQ_SIGNAL( "clicked()" ),      self, TQ_SLOT( "accept()" ) )
+        connect( @m_cancelButton, TQ_SIGNAL( "clicked()" ),      self, TQ_SLOT( "cancel()" ) )
 
-        connect( @m_saveDir, SIGNAL( "textChanged(const TQString &)" ),
-                 self,       SLOT( "textChanged(const TQString &)" ) );
+        connect( @m_saveDir, TQ_SIGNAL( "textChanged(const TQString &)" ),
+                 self,       TQ_SLOT( "textChanged(const TQString &)" ) );
 
         @Form1Layout.addLayout(@layout3, 0, 0)
         languageChange()
diff --git a/amarok/src/scripts/graphequalizer/main.cpp b/amarok/src/scripts/graphequalizer/main.cpp
index 6bd13e61..6813cff5 100644
--- a/amarok/src/scripts/graphequalizer/main.cpp
+++ b/amarok/src/scripts/graphequalizer/main.cpp
@@ -42,9 +42,9 @@ int main(int argc, char **argv)
     mainWin->show();
     StdinReader* listen = new StdinReader(mainWin, "ioListener");
     CallAmarok* ca = new CallAmarok(mainWin,"ca", mainWin->canvasView,mainWin->preampSlider);
-    mainWin->connect(listen, TQT_SIGNAL(openWindow()), mainWin, TQT_SLOT(show()));
-    mainWin->connect(mainWin->canvasView,TQT_SIGNAL(eqChanged()),ca, TQT_SLOT(updateEq()));
-    mainWin->connect(mainWin->preampSlider,TQT_SIGNAL(sliderReleased()),ca, TQT_SLOT(updateEq()));
+    mainWin->connect(listen, TQ_SIGNAL(openWindow()), mainWin, TQ_SLOT(show()));
+    mainWin->connect(mainWin->canvasView,TQ_SIGNAL(eqChanged()),ca, TQ_SLOT(updateEq()));
+    mainWin->connect(mainWin->preampSlider,TQ_SIGNAL(sliderReleased()),ca, TQ_SLOT(updateEq()));
     return app.exec();
 }
 
diff --git a/amarok/src/scripts/graphequalizer/stdinreader.h b/amarok/src/scripts/graphequalizer/stdinreader.h
index a29ead8e..33edd8d9 100644
--- a/amarok/src/scripts/graphequalizer/stdinreader.h
+++ b/amarok/src/scripts/graphequalizer/stdinreader.h
@@ -19,7 +19,7 @@ public:
     :TQObject(parent,name)
     {
         TQSocketNotifier* streamListener = new TQSocketNotifier(0, TQSocketNotifier::Read, this, "stdinWatcher");
-        connect(streamListener, TQT_SIGNAL(activated(int)), this, TQT_SLOT(dataRecieved()) );
+        connect(streamListener, TQ_SIGNAL(activated(int)), this, TQ_SLOT(dataRecieved()) );
 
     }
     ~StdinReader() { }
diff --git a/amarok/src/scripts/templates/amarok.rb b/amarok/src/scripts/templates/amarok.rb
index fa7b2c2a..b4170de2 100644
--- a/amarok/src/scripts/templates/amarok.rb
+++ b/amarok/src/scripts/templates/amarok.rb
@@ -25,7 +25,7 @@ class QtIoListener < TQt::Object
 		@lineHandler = lineHandler
 		@iostream = iostream
 		streamListener = TQt::SocketNotifier.new(iostream.fileno, TQt::SocketNotifier.Read, app, 'stdinWatcher')
-		TQt::Object.connect(streamListener, SIGNAL("activated(int)"), self, SLOT("dataRecieved()") )
+		TQt::Object.connect(streamListener, TQ_SIGNAL("activated(int)"), self, TQ_SLOT("dataRecieved()") )
 
 	end
 	def dataRecieved
diff --git a/amarok/src/scripts/templates/python_qt_template.py b/amarok/src/scripts/templates/python_qt_template.py
index 1a2417fa..88775b45 100755
--- a/amarok/src/scripts/templates/python_qt_template.py
+++ b/amarok/src/scripts/templates/python_qt_template.py
@@ -146,7 +146,7 @@ class Test( TQApplication ):
 
         self.dia = ConfigDialog()
         self.dia.show()
-        self.connect( self.dia, SIGNAL( "destroyed()" ), self.readSettings )
+        self.connect( self.dia, TQ_SIGNAL( "destroyed()" ), self.readSettings )
 
     def engineStatePlay( self ):
         """ Called when Engine state changes to Play """
diff --git a/amarok/src/scripts/webcontrol/WebControl.py b/amarok/src/scripts/webcontrol/WebControl.py
index 03a5f9f4..4c35eb04 100755
--- a/amarok/src/scripts/webcontrol/WebControl.py
+++ b/amarok/src/scripts/webcontrol/WebControl.py
@@ -94,8 +94,8 @@ class ConfigDialog( TQDialog ):
         self.cancel.setText( "Cancel" )
         self.cancel.setDefault( True )
 
-        self.connect( self.ok,     SIGNAL( "clicked()" ), self.save )
-        self.connect( self.cancel, SIGNAL( "clicked()" ), self, SLOT( "reject()" ) )
+        self.connect( self.ok,     TQ_SIGNAL( "clicked()" ), self.save )
+        self.connect( self.cancel, TQ_SIGNAL( "clicked()" ), self, TQ_SLOT( "reject()" ) )
 
         self.adjustSize()
 
@@ -147,7 +147,7 @@ class WebControl( TQApplication ):
 
         self.zeroconfPublishing()
         self.snsrv = TQSocketNotifier(self.srv.fileno(), TQSocketNotifier.Read)
-        self.snsrv.connect( self.snsrv, SIGNAL('activated(int)'), self.readSocket )
+        self.snsrv.connect( self.snsrv, TQ_SIGNAL('activated(int)'), self.readSocket )
 
     def readSocket( self ):
         # Got a read event on the HTTP server socket.
@@ -230,7 +230,7 @@ class WebControl( TQApplication ):
 
         self.dia = ConfigDialog()
         self.dia.show()
-        self.connect( self.dia, SIGNAL( "destroyed()" ), self.postConfigure )
+        self.connect( self.dia, TQ_SIGNAL( "destroyed()" ), self.postConfigure )
 
     def engineStatePlay( self ):
         """ Called when Engine state changes to Play """