Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

11 files changed, 28 insertions, 28 deletions

diff --git a/templates/annotated/menuapp1.py b/templates/annotated/menuapp1.py
index 89c2568..fea64c0 100644
--- a/templates/annotated/menuapp1.py
+++ b/templates/annotated/menuapp1.py
@@ -43,7 +43,7 @@ True  = not False
 
 import sys
 
-from PyTQt.tqt import TQPopupMenu, SIGNAL
+from PyTQt.tqt import TQPopupMenu, TQ_SIGNAL
 
 from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, TDEStdAccel, TDEIcon, TDEIconLoader
 from tdeui import TDEMainWindow, KMessageBox
@@ -159,17 +159,17 @@ class MainWin (TDEMainWindow):
         # are easier ways to do this - see other menuapp templates for easier
         # methods using TDEAction/KStdAction
 
-        self.toolBar ().insertButton (icons.loadIcon ("filenew", TDEIcon.Toolbar), TOOLBAR_NEW, SIGNAL ("clicked (int)"), self.slotNew,\
+        self.toolBar ().insertButton (icons.loadIcon ("filenew", TDEIcon.Toolbar), TOOLBAR_NEW, TQ_SIGNAL ("clicked (int)"), self.slotNew,\
                                                        True, "New")
-        self.toolBar ().insertButton (icons.loadIcon ("fileopen", TDEIcon.Toolbar), TOOLBAR_OPEN, SIGNAL ("clicked (int)"), self.slotOpen,\
+        self.toolBar ().insertButton (icons.loadIcon ("fileopen", TDEIcon.Toolbar), TOOLBAR_OPEN, TQ_SIGNAL ("clicked (int)"), self.slotOpen,\
                                                        True, "Open")
-        self.toolBar ().insertButton (icons.loadIcon ("filesave", TDEIcon.Toolbar), TOOLBAR_SAVE, SIGNAL ("clicked (int)"), self.slotSave,\
+        self.toolBar ().insertButton (icons.loadIcon ("filesave", TDEIcon.Toolbar), TOOLBAR_SAVE, TQ_SIGNAL ("clicked (int)"), self.slotSave,\
                                                        True, "Save")
-        self.toolBar ().insertButton (icons.loadIcon ("editcut", TDEIcon.Toolbar), TOOLBAR_CUT, SIGNAL ("clicked (int)"), self.slotCut,\
+        self.toolBar ().insertButton (icons.loadIcon ("editcut", TDEIcon.Toolbar), TOOLBAR_CUT, TQ_SIGNAL ("clicked (int)"), self.slotCut,\
                                                        True, "Cut")
-        self.toolBar ().insertButton (icons.loadIcon ("editcopy", TDEIcon.Toolbar), TOOLBAR_COPY, SIGNAL ("clicked (int)"), self.slotCopy,\
+        self.toolBar ().insertButton (icons.loadIcon ("editcopy", TDEIcon.Toolbar), TOOLBAR_COPY, TQ_SIGNAL ("clicked (int)"), self.slotCopy,\
                                                        True, "Copy")
-        self.toolBar ().insertButton (icons.loadIcon ("editpaste", TDEIcon.Toolbar), TOOLBAR_PASTE, SIGNAL ("clicked (int)"), self.slotPaste,\
+        self.toolBar ().insertButton (icons.loadIcon ("editpaste", TDEIcon.Toolbar), TOOLBAR_PASTE, TQ_SIGNAL ("clicked (int)"), self.slotPaste,\
                                                        True, "Paste")
 
     def initStatusBar (self):
diff --git a/templates/annotated/menuapp2.py b/templates/annotated/menuapp2.py
index bfdae1b..d7a4af2 100644
--- a/templates/annotated/menuapp2.py
+++ b/templates/annotated/menuapp2.py
@@ -41,7 +41,7 @@ True  = not False
 
 import sys
 
-from PyTQt.tqt import TQPopupMenu, SIGNAL
+from PyTQt.tqt import TQPopupMenu, TQ_SIGNAL
 
 from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n
 from tdeui import TDEMainWindow, KMessageBox, KStdAction, TDEAction
diff --git a/templates/annotated/menuapp3.py b/templates/annotated/menuapp3.py
index 924e60d..1d99aa3 100644
--- a/templates/annotated/menuapp3.py
+++ b/templates/annotated/menuapp3.py
@@ -41,7 +41,7 @@ True  = not False
 
 import sys
 
-from PyTQt.tqt import TQPopupMenu, SIGNAL
+from PyTQt.tqt import TQPopupMenu, TQ_SIGNAL
 
 from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n
 from tdeui import TDEMainWindow, KMessageBox, KStdAction, TDEAction, TDEActionCollection
diff --git a/templates/annotated/systray.py b/templates/annotated/systray.py
index 989719e..f0a005a 100644
--- a/templates/annotated/systray.py
+++ b/templates/annotated/systray.py
@@ -29,7 +29,7 @@ copyright holder.
 
 import sys
 
-from PyTQt.tqt import TQWidget, SIGNAL
+from PyTQt.tqt import TQWidget, TQ_SIGNAL
 from tdecore import TDEApplication, TDEIcon, TDEIconLoader
 from tdeui import  KSystemTray
 
@@ -71,7 +71,7 @@ icons = TDEIconLoader ()
 systray = KSystemTray (mainWindow)
 
 systray.setPixmap (icons.loadIcon("process-stop", TDEIcon.Desktop))
-systray.connect (systray, SIGNAL ("quitSelected ()"), slotQuitSelected)
+systray.connect (systray, TQ_SIGNAL ("quitSelected ()"), slotQuitSelected)
 systray.show ()
 
 # Comment this out if you don't want the main window to show
diff --git a/templates/annotated/systray1.py b/templates/annotated/systray1.py
index d3f0ae7..8e164a2 100644
--- a/templates/annotated/systray1.py
+++ b/templates/annotated/systray1.py
@@ -35,7 +35,7 @@ copyright holder.
 
 import sys
 
-from PyTQt.tqt import TQLabel, TQWidget, SIGNAL
+from PyTQt.tqt import TQLabel, TQWidget, TQ_SIGNAL
 from tdecore import TDEApplication, TDEIcon, TDEIconLoader
 from tdeui import TDEMainWindow, KSystemTray
 
@@ -58,7 +58,7 @@ class MainWin (TDEMainWindow):
         # KSystemTray hides or shows its parent when the system tray icon is clicked
         self.systray = KSystemTray (self)
         self.systray.setPixmap (icons.loadIcon("process-stop", TDEIcon.Desktop))
-        self.systray.connect (self.systray, SIGNAL ("quitSelected ()"), self.slotQuitSelected)
+        self.systray.connect (self.systray, TQ_SIGNAL ("quitSelected ()"), self.slotQuitSelected)
         self.systray.show ()
 
     # Controls whether or not the application really exits
diff --git a/templates/basic/basicapp.py b/templates/basic/basicapp.py
index 938e2e9..6729fe3 100644
--- a/templates/basic/basicapp.py
+++ b/templates/basic/basicapp.py
@@ -29,7 +29,7 @@ copyright holder.
 
 import sys
 
-from PyTQt.tqt import SIGNAL
+from PyTQt.tqt import TQ_SIGNAL
 from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData
 from tdeui import TDEMainWindow
 
@@ -54,5 +54,5 @@ TDECmdLineArgs.init (sys.argv, aboutData)
 app = TDEApplication ()
 mainWindow = MainWin (None, "main window")
 mainWindow.show()
-app.connect (app, SIGNAL ("lastWindowClosed()"), app.quit)
+app.connect (app, TQ_SIGNAL ("lastWindowClosed()"), app.quit)
 app.exec_loop()
diff --git a/templates/basic/menuapp1.py b/templates/basic/menuapp1.py
index c7f768f..647b9d9 100644
--- a/templates/basic/menuapp1.py
+++ b/templates/basic/menuapp1.py
@@ -38,7 +38,7 @@ copyright holder.
 
 import sys
 
-from PyTQt.tqt import TQPopupMenu, SIGNAL
+from PyTQt.tqt import TQPopupMenu, TQ_SIGNAL
 
 from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, TDEStdAccel, TDEIcon, TDEIconLoader
 from tdeui import TDEMainWindow, KMessageBox
@@ -100,17 +100,17 @@ class MainWin (TDEMainWindow):
     def initToolBar (self):
         icons = TDEIconLoader ()
 
-        self.toolBar ().insertButton (icons.loadIcon ("filenew", TDEIcon.Toolbar), TOOLBAR_NEW, SIGNAL ("clicked (int)"), self.slotNew,\
+        self.toolBar ().insertButton (icons.loadIcon ("filenew", TDEIcon.Toolbar), TOOLBAR_NEW, TQ_SIGNAL ("clicked (int)"), self.slotNew,\
                                                        True, "New")
-        self.toolBar ().insertButton (icons.loadIcon ("fileopen", TDEIcon.Toolbar), TOOLBAR_OPEN, SIGNAL ("clicked (int)"), self.slotOpen,\
+        self.toolBar ().insertButton (icons.loadIcon ("fileopen", TDEIcon.Toolbar), TOOLBAR_OPEN, TQ_SIGNAL ("clicked (int)"), self.slotOpen,\
                                                        True, "Open")
-        self.toolBar ().insertButton (icons.loadIcon ("filesave", TDEIcon.Toolbar), TOOLBAR_SAVE, SIGNAL ("clicked (int)"), self.slotSave,\
+        self.toolBar ().insertButton (icons.loadIcon ("filesave", TDEIcon.Toolbar), TOOLBAR_SAVE, TQ_SIGNAL ("clicked (int)"), self.slotSave,\
                                                        True, "Save")
-        self.toolBar ().insertButton (icons.loadIcon ("editcut", TDEIcon.Toolbar), TOOLBAR_CUT, SIGNAL ("clicked (int)"), self.slotCut,\
+        self.toolBar ().insertButton (icons.loadIcon ("editcut", TDEIcon.Toolbar), TOOLBAR_CUT, TQ_SIGNAL ("clicked (int)"), self.slotCut,\
                                                        True, "Cut")
-        self.toolBar ().insertButton (icons.loadIcon ("editcopy", TDEIcon.Toolbar), TOOLBAR_COPY, SIGNAL ("clicked (int)"), self.slotCopy,\
+        self.toolBar ().insertButton (icons.loadIcon ("editcopy", TDEIcon.Toolbar), TOOLBAR_COPY, TQ_SIGNAL ("clicked (int)"), self.slotCopy,\
                                                        True, "Copy")
-        self.toolBar ().insertButton (icons.loadIcon ("editpaste", TDEIcon.Toolbar), TOOLBAR_PASTE, SIGNAL ("clicked (int)"), self.slotPaste,\
+        self.toolBar ().insertButton (icons.loadIcon ("editpaste", TDEIcon.Toolbar), TOOLBAR_PASTE, TQ_SIGNAL ("clicked (int)"), self.slotPaste,\
                                                        True, "Paste")
 
     def initStatusBar (self):
diff --git a/templates/basic/menuapp2.py b/templates/basic/menuapp2.py
index 05d6464..9170426 100644
--- a/templates/basic/menuapp2.py
+++ b/templates/basic/menuapp2.py
@@ -37,7 +37,7 @@ copyright holder.
 
 import sys
 
-from PyTQt.tqt import TQPopupMenu, SIGNAL
+from PyTQt.tqt import TQPopupMenu, TQ_SIGNAL
 
 from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, TDEShortcut
 from tdeui import TDEMainWindow, KMessageBox, KStdAction, TDEAction
diff --git a/templates/basic/menuapp3.py b/templates/basic/menuapp3.py
index 3f849ba..89cb7e0 100644
--- a/templates/basic/menuapp3.py
+++ b/templates/basic/menuapp3.py
@@ -41,7 +41,7 @@ True  = not False
 
 import sys
 
-from PyTQt.tqt import TQPopupMenu, SIGNAL
+from PyTQt.tqt import TQPopupMenu, TQ_SIGNAL
 
 from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, TDEShortcut
 from tdeui import TDEMainWindow, KMessageBox, KStdAction, TDEAction, TDEActionCollection
diff --git a/templates/basic/systray.py b/templates/basic/systray.py
index f88dae5..617f15b 100644
--- a/templates/basic/systray.py
+++ b/templates/basic/systray.py
@@ -29,7 +29,7 @@ copyright holder.
 
 import sys
 
-from PyTQt.tqt import TQWidget, SIGNAL
+from PyTQt.tqt import TQWidget, TQ_SIGNAL
 from tdecore import TDEApplication, TDEIcon, TDEIconLoader, TDEAboutData, TDECmdLineArgs
 from tdeui import  KSystemTray
 
@@ -63,7 +63,7 @@ icons = TDEIconLoader ()
 systray = KSystemTray (mainWindow)
 
 systray.setPixmap (icons.loadIcon("process-stop", TDEIcon.Desktop))
-systray.connect (systray, SIGNAL ("quitSelected ()"), slotQuitSelected)
+systray.connect (systray, TQ_SIGNAL ("quitSelected ()"), slotQuitSelected)
 systray.show ()
 
 mainWindow.show()
diff --git a/templates/basic/systray1.py b/templates/basic/systray1.py
index 1442e0c..d112813 100644
--- a/templates/basic/systray1.py
+++ b/templates/basic/systray1.py
@@ -29,7 +29,7 @@ copyright holder.
 
 import sys
 
-from PyTQt.tqt import TQLabel, TQWidget, SIGNAL
+from PyTQt.tqt import TQLabel, TQWidget, TQ_SIGNAL
 from tdecore import TDEApplication, TDEIcon, TDEIconLoader
 from tdeui import TDEMainWindow, KSystemTray
 
@@ -43,7 +43,7 @@ class MainWin (TDEMainWindow):
 
         self.systray = KSystemTray (self)
         self.systray.setPixmap (icons.loadIcon("process-stop", TDEIcon.Desktop))
-        self.systray.connect (self.systray, SIGNAL ("quitSelected ()"), self.slotQuitSelected)
+        self.systray.connect (self.systray, TQ_SIGNAL ("quitSelected ()"), self.slotQuitSelected)
         self.systray.show ()
 
     def queryClose (self):