Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit bde8dd4103c094d23e7a96d9754d691e385f1cac)

7 files changed, 92 insertions, 92 deletions

diff --git a/mountconfig/SMBShareSelectDialog.py b/mountconfig/SMBShareSelectDialog.py
index 3c2915b..1fc32b5 100644
--- a/mountconfig/SMBShareSelectDialog.py
+++ b/mountconfig/SMBShareSelectDialog.py
@@ -55,17 +55,17 @@ class SMBShareSelectDialog(KDialogBase):
         self.treeview.header().hide()
         self.treeview.setRootIsDecorated(True)
         
-        self.connect(self.treeview,SIGNAL("expanded(TQListViewItem *)"),self.slotNodeExpanded)
-        self.connect(self.treeview,SIGNAL("selectionChanged(TQListViewItem *)"),self.slotNodeSelected)
-        self.connect(self.treeview,SIGNAL("clicked(TQListViewItem *)"),self.slotClicked)
+        self.connect(self.treeview,TQ_SIGNAL("expanded(TQListViewItem *)"),self.slotNodeExpanded)
+        self.connect(self.treeview,TQ_SIGNAL("selectionChanged(TQListViewItem *)"),self.slotNodeSelected)
+        self.connect(self.treeview,TQ_SIGNAL("clicked(TQListViewItem *)"),self.slotClicked)
         self.dirlister = KDirLister()
         self.dirlister.setDirOnlyMode(True)
         self.dirlister.setAutoUpdate(False)
         self.dirlister.setAutoErrorHandlingEnabled(True,self)
-        self.connect(self.dirlister,SIGNAL("newItems(const KFileItemList &)"),self.slotNewItems)
-        self.connect(self.dirlister,SIGNAL("completed()"),self.slotDirListCompleted)
-        self.connect(self.dirlister,SIGNAL("canceled()"),self.slotDirListCanceled)
-        self.connect(self.dirlister,SIGNAL("redirection(const KURL &,const KURL &)"),self.slotDirListRedirection)
+        self.connect(self.dirlister,TQ_SIGNAL("newItems(const KFileItemList &)"),self.slotNewItems)
+        self.connect(self.dirlister,TQ_SIGNAL("completed()"),self.slotDirListCompleted)
+        self.connect(self.dirlister,TQ_SIGNAL("canceled()"),self.slotDirListCanceled)
+        self.connect(self.dirlister,TQ_SIGNAL("redirection(const KURL &,const KURL &)"),self.slotDirListRedirection)
         self.enableButtonOK(False)
 
         # The "Connect as" part
@@ -87,18 +87,18 @@ class SMBShareSelectDialog(KDialogBase):
         tmplabel = TQLabel(widget)
         tmplabel.setText(i18n("Guest"))
         grid.addWidget(tmplabel,1,2)
-        self.connect(self.guestradio,SIGNAL("stateChanged(int)"),self.slotGuestRadioClicked)
+        self.connect(self.guestradio,TQ_SIGNAL("stateChanged(int)"),self.slotGuestRadioClicked)
         
         self.userradio = TQRadioButton(widget)
         grid.addWidget(self.userradio,2,1)
         tmplabel = TQLabel(widget)
         tmplabel.setText(i18n("Username:"))
         grid.addWidget(tmplabel,2,2)
-        self.connect(self.userradio,SIGNAL("stateChanged(int)"),self.slotUserRadioClicked)
+        self.connect(self.userradio,TQ_SIGNAL("stateChanged(int)"),self.slotUserRadioClicked)
         
         self.usernameedit = KLineEdit(widget)
         grid.addWidget(self.usernameedit,2,3)
-        self.connect(self.usernameedit,SIGNAL("textChanged(const TQString &)"),self.slotUsernameChanged)
+        self.connect(self.usernameedit,TQ_SIGNAL("textChanged(const TQString &)"),self.slotUsernameChanged)
         
         tmplabel = TQLabel(widget)
         tmplabel.setText(i18n("Password:"))
@@ -109,7 +109,7 @@ class SMBShareSelectDialog(KDialogBase):
         
         self.reconnectbutton = KPushButton(i18n("Reconnect now"),widget)
         grid.addMultiCellWidget(self.reconnectbutton,4,4,1,3)
-        self.connect(self.reconnectbutton,SIGNAL("clicked()"),self.slotReconnectClicked)
+        self.connect(self.reconnectbutton,TQ_SIGNAL("clicked()"),self.slotReconnectClicked)
         
         self.dirlistertimer = None
         
diff --git a/mountconfig/SimpleCommandRunner.py b/mountconfig/SimpleCommandRunner.py
index 9936ba1..0b9d941 100644
--- a/mountconfig/SimpleCommandRunner.py
+++ b/mountconfig/SimpleCommandRunner.py
@@ -46,8 +46,8 @@ class SimpleCommandRunner(TQObject):
         proc = TDEProcess()
         proc.setEnvironment("LANG","US")
         proc.setEnvironment("LC_ALL","US")
-        self.connect(proc,SIGNAL("receivedStdout(TDEProcess *,char *,int)"),self.slotStdout)        
-        self.connect(proc,SIGNAL("receivedStderr(TDEProcess *,char *,int)"),self.slotStderr)
+        self.connect(proc,TQ_SIGNAL("receivedStdout(TDEProcess *,char *,int)"),self.slotStdout)        
+        self.connect(proc,TQ_SIGNAL("receivedStderr(TDEProcess *,char *,int)"),self.slotStderr)
         proc.setArguments(cmdlist)
         rc = None
         if proc.start(proc.Block,proc.AllOutput)==True:
diff --git a/mountconfig/fuser.py b/mountconfig/fuser.py
index a84be6d..87d0719 100644
--- a/mountconfig/fuser.py
+++ b/mountconfig/fuser.py
@@ -133,12 +133,12 @@ class FUser(FUserUI):
             application.
             """)) % (self.device,self.device,self.device))
 
-        self.connect(self.cancelbutton,SIGNAL("clicked()"),self.slotCancelButtonClicked)
-        self.connect(self.killbutton,SIGNAL("clicked()"),self.slotKillButtonClicked)
-        self.connect(self.killallbutton,SIGNAL("clicked()"),self.slotKillallButtonClicked)
-        self.connect(self.refreshbutton,SIGNAL("clicked()"),self.refreshProcesslist)
-        self.connect(self.processlist,SIGNAL("selectionChanged()"),self.slotSelectionChanged)
-        self.connect(self.umountbutton,SIGNAL("clicked()"),self.slotUmountButtonClicked)
+        self.connect(self.cancelbutton,TQ_SIGNAL("clicked()"),self.slotCancelButtonClicked)
+        self.connect(self.killbutton,TQ_SIGNAL("clicked()"),self.slotKillButtonClicked)
+        self.connect(self.killallbutton,TQ_SIGNAL("clicked()"),self.slotKillallButtonClicked)
+        self.connect(self.refreshbutton,TQ_SIGNAL("clicked()"),self.refreshProcesslist)
+        self.connect(self.processlist,TQ_SIGNAL("selectionChanged()"),self.slotSelectionChanged)
+        self.connect(self.umountbutton,TQ_SIGNAL("clicked()"),self.slotUmountButtonClicked)
 
         # TODO: Make optionsbutton resize dialog if processframe is hidden, hide Optionsbutton until then.
         self.optionsbutton.hide()
diff --git a/mountconfig/mountconfig.py b/mountconfig/mountconfig.py
index f377362..260f215 100755
--- a/mountconfig/mountconfig.py
+++ b/mountconfig/mountconfig.py
@@ -1386,10 +1386,10 @@ class MountEntryDialogOptions(TQWidget):
             hbox.setSpacing(KDialog.spacingHint())
             self.mountpointlineedit = KLineEdit(hbox)
             hbox.setStretchFactor(self.mountpointlineedit,1)
-            #self.connect(self.homediredit, SIGNAL("textChanged(const TQString &)"), self.slotHomeDirChanged)
+            #self.connect(self.homediredit, TQ_SIGNAL("textChanged(const TQString &)"), self.slotHomeDirChanged)
             self.mountpointbutton = KPushButton(i18n("Browse..."),hbox)
             hbox.setStretchFactor(self.mountpointbutton,0)
-            self.connect(self.mountpointbutton,SIGNAL("clicked()"),self.slotBrowseMountPointClicked)
+            self.connect(self.mountpointbutton,TQ_SIGNAL("clicked()"),self.slotBrowseMountPointClicked)
             grid.addMultiCellWidget(hbox,row,row,1,3)
             row += 1
 
@@ -1401,7 +1401,7 @@ class MountEntryDialogOptions(TQWidget):
             grid.addWidget(label,row,0)
 
             self.devicecheckbox = TQRadioButton(i18n("by name"),hbox)
-            self.connect(self.devicecheckbox,SIGNAL("clicked()"), \
+            self.connect(self.devicecheckbox,TQ_SIGNAL("clicked()"), \
                 self.slotDeviceCheckboxClicked)
             self.devicelineedit = KLineEdit(hbox)
             grid.addMultiCellWidget(hbox,row,row,1,3)
@@ -1414,7 +1414,7 @@ class MountEntryDialogOptions(TQWidget):
             hbox = TQHBox(self)
             hbox.setSpacing(KDialog.spacingHint())
             self.uuidcheckbox = TQRadioButton(i18n("by UUID"),hbox)
-            self.connect(self.uuidcheckbox,SIGNAL("clicked()"), \
+            self.connect(self.uuidcheckbox,TQ_SIGNAL("clicked()"), \
                 self.slotUUIDCheckboxClicked)
             self.uuidlineedit = KLineEdit(hbox)
             grid.addMultiCellWidget(hbox,row,row,1,3)
@@ -1424,7 +1424,7 @@ class MountEntryDialogOptions(TQWidget):
             hbox = TQHBox(self)
             hbox.setSpacing(KDialog.spacingHint())
             self.labelcheckbox = TQRadioButton(i18n("by label"),hbox)
-            self.connect(self.labelcheckbox,SIGNAL("clicked()"), \
+            self.connect(self.labelcheckbox,TQ_SIGNAL("clicked()"), \
                 self.slotLabelCheckboxClicked)
             self.labellineedit = KLineEdit(hbox)
             grid.addMultiCellWidget(hbox,row,row,1,3)
@@ -1637,10 +1637,10 @@ class MountEntryDialogOptionsCommonUnix(MountEntryDialogOptions):
         hbox.setSpacing(KDialog.spacingHint())
         self.mountpointlineedit = KLineEdit(hbox)
         hbox.setStretchFactor(self.mountpointlineedit,1)
-        #self.connect(self.homediredit, SIGNAL("textChanged(const TQString &)"), self.slotHomeDirChanged)
+        #self.connect(self.homediredit, TQ_SIGNAL("textChanged(const TQString &)"), self.slotHomeDirChanged)
         self.mountpointbutton = KPushButton(i18n("Browse..."),hbox)
         hbox.setStretchFactor(self.mountpointbutton,0)
-        self.connect(self.mountpointbutton,SIGNAL("clicked()"), \
+        self.connect(self.mountpointbutton,TQ_SIGNAL("clicked()"), \
             self.slotBrowseMountPointClicked)
         grid.addWidget(hbox,row,1)
         row += 1
@@ -1654,7 +1654,7 @@ class MountEntryDialogOptionsCommonUnix(MountEntryDialogOptions):
             grid.addWidget(label,row,0)
 
             self.devicecheckbox = TQRadioButton(i18n("by name"),hbox)
-            self.connect(self.devicecheckbox,SIGNAL("clicked()"), \
+            self.connect(self.devicecheckbox,TQ_SIGNAL("clicked()"), \
                 self.slotDeviceCheckboxClicked)
             self.devicelineedit = KLineEdit(hbox)
             grid.addWidget(hbox,row,1)
@@ -1667,7 +1667,7 @@ class MountEntryDialogOptionsCommonUnix(MountEntryDialogOptions):
                 hbox = TQHBox(self)
                 hbox.setSpacing(KDialog.spacingHint())
                 self.uuidcheckbox = TQRadioButton(i18n("by UUID"),hbox)
-                self.connect(self.uuidcheckbox,SIGNAL("clicked()"), \
+                self.connect(self.uuidcheckbox,TQ_SIGNAL("clicked()"), \
                     self.slotUUIDCheckboxClicked)
                 self.uuidlineedit = KLineEdit(hbox)
                 grid.addWidget(hbox,row,1)
@@ -1677,7 +1677,7 @@ class MountEntryDialogOptionsCommonUnix(MountEntryDialogOptions):
                 hbox = TQHBox(self)
                 hbox.setSpacing(KDialog.spacingHint())
                 self.labelcheckbox = TQRadioButton(i18n("by label"),hbox)
-                self.connect(self.labelcheckbox,SIGNAL("clicked()"), \
+                self.connect(self.labelcheckbox,TQ_SIGNAL("clicked()"), \
                     self.slotLabelCheckboxClicked)
                 self.labellineedit = KLineEdit(hbox)
                 grid.addWidget(hbox,row,1)
@@ -1714,7 +1714,7 @@ class MountEntryDialogOptionsCommonUnix(MountEntryDialogOptions):
         #grid.addWidget(,9,0)
         button = KPushButton(i18n("Advanced..."),self)
         button.setSizePolicy(TQSizePolicy.Fixed,TQSizePolicy.Fixed)
-        self.connect(button,SIGNAL("clicked()"),self.slotAdvancedClicked)
+        self.connect(button,TQ_SIGNAL("clicked()"),self.slotAdvancedClicked)
         grid.addWidget(button,row,1,TQt.AlignRight)
         row += 1
 
@@ -1891,10 +1891,10 @@ class MountEntryDialogOptionsVFAT(MountEntryDialogOptions):
         hbox.setSpacing(KDialog.spacingHint())
         self.mountpointlineedit = KLineEdit(hbox)
         hbox.setStretchFactor(self.mountpointlineedit,1)
-        #self.connect(self.homediredit, SIGNAL("textChanged(const TQString &)"), self.slotHomeDirChanged)
+        #self.connect(self.homediredit, TQ_SIGNAL("textChanged(const TQString &)"), self.slotHomeDirChanged)
         self.mountpointbutton = KPushButton(i18n("Browse..."),hbox)
         hbox.setStretchFactor(self.mountpointbutton,0)
-        self.connect(self.mountpointbutton,SIGNAL("clicked()"),self.slotBrowseMountPointClicked)
+        self.connect(self.mountpointbutton,TQ_SIGNAL("clicked()"),self.slotBrowseMountPointClicked)
         grid.addMultiCellWidget(hbox,row,row,1,3)
         row += 1
 
@@ -1906,7 +1906,7 @@ class MountEntryDialogOptionsVFAT(MountEntryDialogOptions):
             grid.addWidget(label,row,0)
 
             self.devicecheckbox = TQRadioButton(i18n("by name"),hbox)
-            self.connect(self.devicecheckbox,SIGNAL("clicked()"), \
+            self.connect(self.devicecheckbox,TQ_SIGNAL("clicked()"), \
                 self.slotDeviceCheckboxClicked)
             self.devicelineedit = KLineEdit(hbox)
             grid.addWidget(hbox,row,1)
@@ -1919,7 +1919,7 @@ class MountEntryDialogOptionsVFAT(MountEntryDialogOptions):
                 hbox = TQHBox(self)
                 hbox.setSpacing(KDialog.spacingHint())
                 self.uuidcheckbox = TQRadioButton(i18n("by UUID"),hbox)
-                self.connect(self.uuidcheckbox,SIGNAL("clicked()"), \
+                self.connect(self.uuidcheckbox,TQ_SIGNAL("clicked()"), \
                     self.slotUUIDCheckboxClicked)
                 self.uuidlineedit = KLineEdit(hbox)
                 grid.addWidget(hbox,row,1)
@@ -1929,7 +1929,7 @@ class MountEntryDialogOptionsVFAT(MountEntryDialogOptions):
                 hbox = TQHBox(self)
                 hbox.setSpacing(KDialog.spacingHint())
                 self.labelcheckbox = TQRadioButton(i18n("by label"),hbox)
-                self.connect(self.labelcheckbox,SIGNAL("clicked()"), \
+                self.connect(self.labelcheckbox,TQ_SIGNAL("clicked()"), \
                     self.slotLabelCheckboxClicked)
                 self.labellineedit = KLineEdit(hbox)
                 grid.addWidget(hbox,row,1)
@@ -1998,7 +1998,7 @@ class MountEntryDialogOptionsVFAT(MountEntryDialogOptions):
         row += 1
         button = KPushButton(i18n("Advanced..."),self)
         button.setSizePolicy(TQSizePolicy.Fixed,TQSizePolicy.Fixed)
-        self.connect(button,SIGNAL("clicked()"),self.slotAdvancedClicked)
+        self.connect(button,TQ_SIGNAL("clicked()"),self.slotAdvancedClicked)
         grid.addMultiCellWidget(button,row,row,1,3,TQt.AlignRight)
 
     ########################################################################
@@ -2146,10 +2146,10 @@ class MountEntryDialogOptionsSMB(MountEntryDialogOptions):
         hbox.setSpacing(KDialog.spacingHint())
         self.mountpointlineedit = KLineEdit(hbox)
         hbox.setStretchFactor(self.mountpointlineedit,1)
-        #self.connect(self.homediredit, SIGNAL("textChanged(const TQString &)"), self.slotHomeDirChanged)
+        #self.connect(self.homediredit, TQ_SIGNAL("textChanged(const TQString &)"), self.slotHomeDirChanged)
         self.mountpointbutton = KPushButton(i18n("Browse..."),hbox)
         hbox.setStretchFactor(self.mountpointbutton,0)
-        self.connect(self.mountpointbutton,SIGNAL("clicked()"),self.slotBrowseMountPointClicked)
+        self.connect(self.mountpointbutton,TQ_SIGNAL("clicked()"),self.slotBrowseMountPointClicked)
         grid.addMultiCellWidget(hbox,0,0,1,3)
 
         label = TQLabel(i18n("Network Share:"),self)
@@ -2160,7 +2160,7 @@ class MountEntryDialogOptionsSMB(MountEntryDialogOptions):
         hbox.setStretchFactor(self.devicelineedit,1)
         self.devicelinebutton = KPushButton(i18n("Scan..."),hbox)
         hbox.setStretchFactor(self.devicelinebutton,0)
-        self.connect(self.devicelinebutton,SIGNAL("clicked()"),self.slotBrowseDeviceLineClicked)
+        self.connect(self.devicelinebutton,TQ_SIGNAL("clicked()"),self.slotBrowseDeviceLineClicked)
         grid.addMultiCellWidget(hbox,1,1,1,3)
 
         # Connect as:
@@ -2174,14 +2174,14 @@ class MountEntryDialogOptionsSMB(MountEntryDialogOptions):
         tmplabel = TQLabel(self)
         tmplabel.setText(i18n("Guest"))
         grid.addMultiCellWidget(tmplabel,2,2,2,3)
-        self.connect(self.guestradio,SIGNAL("stateChanged(int)"),self.slotGuestRadioClicked)
+        self.connect(self.guestradio,TQ_SIGNAL("stateChanged(int)"),self.slotGuestRadioClicked)
 
         self.userradio = TQRadioButton(self)
         grid.addWidget(self.userradio,3,1)
         tmplabel = TQLabel(self)
         tmplabel.setText(i18n("Username:"))
         grid.addWidget(tmplabel,3,2)
-        self.connect(self.userradio,SIGNAL("stateChanged(int)"),self.slotUserRadioClicked)
+        self.connect(self.userradio,TQ_SIGNAL("stateChanged(int)"),self.slotUserRadioClicked)
 
         self.usernameedit = KLineEdit(self)
         grid.addWidget(self.usernameedit,3,3)
@@ -2233,7 +2233,7 @@ class MountEntryDialogOptionsSMB(MountEntryDialogOptions):
 
         button = KPushButton(i18n("Advanced..."),self)
         button.setSizePolicy(TQSizePolicy.Fixed,TQSizePolicy.Fixed)
-        self.connect(button,SIGNAL("clicked()"),self.slotAdvancedClicked)
+        self.connect(button,TQ_SIGNAL("clicked()"),self.slotAdvancedClicked)
         grid.addMultiCellWidget(button,13,13,1,3,TQt.AlignRight)
 
         self.selectsmbdialog = None
@@ -2483,7 +2483,7 @@ class MountEntryDialog(KDialogBase):
         self.MountTypeEditors.update(self.MountTypeEditorsSystem)
 
         #hb.setStretchFactor(self.runlevelcombo,0)
-        self.connect(self.mounttypecombo, SIGNAL("activated(int)"), self.slotMountTypeChanged)
+        self.connect(self.mounttypecombo, TQ_SIGNAL("activated(int)"), self.slotMountTypeChanged)
 
         widget = TQWidget(hb)
         hb.setStretchFactor(widget,1)
@@ -2909,11 +2909,11 @@ class MountConfigApp(programbase):
         self.mountlist.setSelectionMode(TQListView.Single)
         self.mountlist.setRootIsDecorated(True)
         self.mountlist.setSorting(-1)
-        self.connect(self.mountlist, SIGNAL("selectionChanged(TQListViewItem *)"), self.slotListClicked)
+        self.connect(self.mountlist, TQ_SIGNAL("selectionChanged(TQListViewItem *)"), self.slotListClicked)
         # Doubleclick in item opens modify dialogue.
-        self.connect(self.mountlist, SIGNAL("doubleClicked(TQListViewItem *)"), self.slotModifyClicked)
+        self.connect(self.mountlist, TQ_SIGNAL("doubleClicked(TQListViewItem *)"), self.slotModifyClicked)
         # Rightclick: Open ContextMenu
-        self.connect(self.mountlist, SIGNAL("contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)"),
+        self.connect(self.mountlist, TQ_SIGNAL("contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)"),
                     self.slotContextMenu)
 
         hbox = TQHBox(topwidget)
@@ -2923,28 +2923,28 @@ class MountConfigApp(programbase):
         toplayout.setStretchFactor(hbox,0)
         self.newbutton = KPushButton(i18n("New..."),hbox)
         hbox.setStretchFactor(self.newbutton,1)
-        self.connect(self.newbutton,SIGNAL("clicked()"),self.slotNewClicked)
+        self.connect(self.newbutton,TQ_SIGNAL("clicked()"),self.slotNewClicked)
         self.newbutton.setEnabled(isroot)
 
         self.modifybutton = KPushButton(i18n("Modify..."),hbox)
         hbox.setStretchFactor(self.modifybutton,1)
-        self.connect(self.modifybutton,SIGNAL("clicked()"),self.slotModifyClicked)
+        self.connect(self.modifybutton,TQ_SIGNAL("clicked()"),self.slotModifyClicked)
 
         self.deletebutton = KPushButton(i18n("Delete..."),hbox)
         hbox.setStretchFactor(self.deletebutton,1)
-        self.connect(self.deletebutton,SIGNAL("clicked()"),self.slotDeleteClicked)
+        self.connect(self.deletebutton,TQ_SIGNAL("clicked()"),self.slotDeleteClicked)
 
         self.enablebutton = KPushButton(i18n("Enable"),hbox)
         hbox.setStretchFactor(self.enablebutton,1)
-        self.connect(self.enablebutton,SIGNAL("clicked()"),self.slotEnableClicked)
+        self.connect(self.enablebutton,TQ_SIGNAL("clicked()"),self.slotEnableClicked)
 
         self.disablebutton = KPushButton(i18n("Disable"),hbox)
         hbox.setStretchFactor(self.disablebutton,1)
-        self.connect(self.disablebutton,SIGNAL("clicked()"),self.slotDisableClicked)
+        self.connect(self.disablebutton,TQ_SIGNAL("clicked()"),self.slotDisableClicked)
 
         self.detailsbutton = KPushButton(i18n("Details..."),hbox)
         hbox.setStretchFactor(self.detailsbutton,1)
-        self.connect(self.detailsbutton,SIGNAL("clicked()"),self.slotDetailsClicked)
+        self.connect(self.detailsbutton,TQ_SIGNAL("clicked()"),self.slotDetailsClicked)
 
         self.devstolistitems = None
         self.uuidstolistitems = None
diff --git a/mountconfig/sizeview.py b/mountconfig/sizeview.py
index 33b1560..fc94c46 100644
--- a/mountconfig/sizeview.py
+++ b/mountconfig/sizeview.py
@@ -119,7 +119,7 @@ class SizeView(TQDialog):
             self.grid.setRowStretch(row,5)
 
         self.clearWState(TQt.WState_Polished)
-        self.connect(self.buttonCancel,SIGNAL("clicked()"),self.hide)
+        self.connect(self.buttonCancel,TQ_SIGNAL("clicked()"),self.hide)
 
         #self.mainlabel = TQLabel("<font size=+2><b>"+self.dialogtitle+"</b></font>",self)
         #self.grid.addWidget(self.mainlabel,0,0)
diff --git a/serviceconfig/serviceconfig.py b/serviceconfig/serviceconfig.py
index 15fa559..1a0c802 100755
--- a/serviceconfig/serviceconfig.py
+++ b/serviceconfig/serviceconfig.py
@@ -1001,7 +1001,7 @@ class SysVInitApp(programbase):
 
         hb.setStretchFactor(self.runlevelcombo,0)
 
-        self.connect(self.runlevelcombo, SIGNAL("activated(int)"), self.slotRunLevelChanged)
+        self.connect(self.runlevelcombo, TQ_SIGNAL("activated(int)"), self.slotRunLevelChanged)
 
         widget = TQWidget(hb)
         hb.setStretchFactor(widget,1)
@@ -1012,7 +1012,7 @@ class SysVInitApp(programbase):
         self.servicelistview.addColumn(i18n("Status"))
         self.servicelistview.setAllColumnsShowFocus(True)
         self.servicelistview.setSelectionMode(TQListView.Single)
-        self.connect(self.servicelistview, SIGNAL("selectionChanged(TQListViewItem *)"), self.slotListClicked)
+        self.connect(self.servicelistview, TQ_SIGNAL("selectionChanged(TQListViewItem *)"), self.slotListClicked)
 
         # Right hand side of the dialog.
         vb = TQVBox(tophb)
@@ -1030,7 +1030,7 @@ class SysVInitApp(programbase):
         self.descriptiontextedit.setReadOnly(True)
         self.startatbootcheckbox = TQCheckBox(i18n("Start during boot"),vb2)
         vb2.setStretchFactor(self.startatbootcheckbox,0)
-        self.connect(self.startatbootcheckbox, SIGNAL("toggled(bool)"), self.slotBootChanged)
+        self.connect(self.startatbootcheckbox, TQ_SIGNAL("toggled(bool)"), self.slotBootChanged)
 
         label = TQLabel(i18n("Status:"),vb2)
         vb2.setStretchFactor(label,0)
@@ -1043,24 +1043,24 @@ class SysVInitApp(programbase):
         vb2.setStretchFactor(hb2,0)
         self.startbutton = TQPushButton(i18n("Start"),hb2)
         hb2.setStretchFactor(self.startbutton,1)
-        self.connect(self.startbutton, SIGNAL("clicked()"), self.slotStartButton)
+        self.connect(self.startbutton, TQ_SIGNAL("clicked()"), self.slotStartButton)
         self.stopbutton = TQPushButton(i18n("Stop"),hb2)
         hb2.setStretchFactor(self.stopbutton,1)
-        self.connect(self.stopbutton, SIGNAL("clicked()"), self.slotStopButton)
+        self.connect(self.stopbutton, TQ_SIGNAL("clicked()"), self.slotStopButton)
         self.restartbutton = TQPushButton(i18n("Restart"),hb2)
         hb2.setStretchFactor(self.restartbutton,1)
-        self.connect(self.restartbutton, SIGNAL("clicked()"), self.slotRestartButton)
+        self.connect(self.restartbutton, TQ_SIGNAL("clicked()"), self.slotRestartButton)
 
         if DISTRO == "Gentoo":
             # Gentoo Linux gets an extra button.
             self.zapbutton = TQPushButton(i18n("Zap"),hb2)
             hb2.setStretchFactor(self.zapbutton,1)
-            self.connect(self.zapbutton, SIGNAL("clicked()"), self.slotZapButton)
+            self.connect(self.zapbutton, TQ_SIGNAL("clicked()"), self.slotZapButton)
 
         if not isroot:
             self.disableStuff()
         else:
-            self.connect(self.servicelistview, SIGNAL("contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)"), 
+            self.connect(self.servicelistview, TQ_SIGNAL("contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)"), 
                     self.slotServiceContextMenu)
 
         self.__fillListView(self.currentrunlevel)
@@ -1395,9 +1395,9 @@ class CommandRunner(KDialogBase):
 
         self.kid = TQProcess()
         self.kid.setCommunication(TQProcess.Stdout|TQProcess.Stderr)
-        self.connect(self.kid,SIGNAL("processExited()"),self.slotProcessExited)
-        self.connect(self.kid,SIGNAL("readyReadStdout()"),self.slotReadyReadStdout)
-        self.connect(self.kid,SIGNAL("readyReadStderr()"),self.slotReadyReadStderr)
+        self.connect(self.kid,TQ_SIGNAL("processExited()"),self.slotProcessExited)
+        self.connect(self.kid,TQ_SIGNAL("readyReadStdout()"),self.slotReadyReadStdout)
+        self.connect(self.kid,TQ_SIGNAL("readyReadStderr()"),self.slotReadyReadStderr)
 
     ########################################################################
     def run(self,argslist):
diff --git a/userconfig/userconfig.py b/userconfig/userconfig.py
index e467661..76140e8 100755
--- a/userconfig/userconfig.py
+++ b/userconfig/userconfig.py
@@ -117,14 +117,14 @@ class UserConfigApp(programbase):
         self.userlist.setAllColumnsShowFocus(True)
         self.userlist.setSelectionMode(TQListView.Single)
 
-        self.connect(self.userlist, SIGNAL("selectionChanged(TQListViewItem *)"), self.slotListClicked)
+        self.connect(self.userlist, TQ_SIGNAL("selectionChanged(TQListViewItem *)"), self.slotListClicked)
         if isroot:
-            self.connect(self.userlist, SIGNAL("doubleClicked(TQListViewItem *)"), self.slotModifyClicked)
-        self.connect(self.userlist, SIGNAL("contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)"), self.slotUserContext)
+            self.connect(self.userlist, TQ_SIGNAL("doubleClicked(TQListViewItem *)"), self.slotModifyClicked)
+        self.connect(self.userlist, TQ_SIGNAL("contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)"), self.slotUserContext)
 
         self.showspecialcheckbox = TQCheckBox(i18n("Show system accounts"),vbox)
         vbox.setStretchFactor(self.showspecialcheckbox,0)
-        self.connect(self.showspecialcheckbox,SIGNAL("toggled(bool)"), self.slotShowSystemToggled)
+        self.connect(self.showspecialcheckbox,TQ_SIGNAL("toggled(bool)"), self.slotShowSystemToggled)
 
         hbox = TQHBox(vbox)
         hbox.setSpacing(KDialog.spacingHint())
@@ -133,15 +133,15 @@ class UserConfigApp(programbase):
 
         self.modifybutton = KPushButton(i18n("Modify..."),hbox)
         hbox.setStretchFactor(self.modifybutton,1)
-        self.connect(self.modifybutton,SIGNAL("clicked()"),self.slotModifyClicked)
+        self.connect(self.modifybutton,TQ_SIGNAL("clicked()"),self.slotModifyClicked)
 
         self.newbutton = KPushButton(i18n("New..."),hbox)
         hbox.setStretchFactor(self.newbutton,1)
-        self.connect(self.newbutton,SIGNAL("clicked()"),self.slotNewClicked)
+        self.connect(self.newbutton,TQ_SIGNAL("clicked()"),self.slotNewClicked)
 
         self.deletebutton = KPushButton(i18n("Delete..."),hbox)
         hbox.setStretchFactor(self.deletebutton,1)
-        self.connect(self.deletebutton,SIGNAL("clicked()"),self.slotDeleteClicked)
+        self.connect(self.deletebutton,TQ_SIGNAL("clicked()"),self.slotDeleteClicked)
 
         detailsbox = TQVGroupBox(i18n("Details"),vbox)
         userinfovbox = TQWidget(detailsbox)
@@ -215,11 +215,11 @@ class UserConfigApp(programbase):
         self.grouplist.addColumn(i18n("Group Name"))
         self.grouplist.addColumn(i18n("GID"))
         self.grouplist.setAllColumnsShowFocus(True)
-        self.connect(self.grouplist, SIGNAL("selectionChanged(TQListViewItem *)"), self.slotGroupListClicked)
+        self.connect(self.grouplist, TQ_SIGNAL("selectionChanged(TQListViewItem *)"), self.slotGroupListClicked)
 
         if isroot:
-            self.connect(self.grouplist, SIGNAL("doubleClicked(TQListViewItem *)"), self.slotModifyGroupClicked)
-        self.connect(self.grouplist, SIGNAL("contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)"),
+            self.connect(self.grouplist, TQ_SIGNAL("doubleClicked(TQListViewItem *)"), self.slotModifyGroupClicked)
+        self.connect(self.grouplist, TQ_SIGNAL("contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)"),
                 self.slotGroupContext)
 
         groupbottomvbox = TQVBox(groupsplitter)
@@ -227,7 +227,7 @@ class UserConfigApp(programbase):
 
         self.showspecialgroupscheckbox = TQCheckBox(i18n("Show system groups"),groupbottomvbox)
         vbox.setStretchFactor(self.showspecialgroupscheckbox,0)
-        self.connect(self.showspecialgroupscheckbox,SIGNAL("toggled(bool)"), self.slotShowSystemGroupsToggled)
+        self.connect(self.showspecialgroupscheckbox,TQ_SIGNAL("toggled(bool)"), self.slotShowSystemGroupsToggled)
 
         hbox = TQHBox(groupbottomvbox)
         hbox.setSpacing(KDialog.spacingHint())
@@ -236,15 +236,15 @@ class UserConfigApp(programbase):
 
         self.modifygroupbutton = KPushButton(i18n("Modify..."),hbox)
         hbox.setStretchFactor(self.modifygroupbutton,1)
-        self.connect(self.modifygroupbutton,SIGNAL("clicked()"),self.slotModifyGroupClicked)
+        self.connect(self.modifygroupbutton,TQ_SIGNAL("clicked()"),self.slotModifyGroupClicked)
 
         self.newgroupbutton = KPushButton(i18n("New..."),hbox)
         hbox.setStretchFactor(self.newgroupbutton,1)
-        self.connect(self.newgroupbutton,SIGNAL("clicked()"),self.slotNewGroupClicked)
+        self.connect(self.newgroupbutton,TQ_SIGNAL("clicked()"),self.slotNewGroupClicked)
 
         self.deletegroupbutton = KPushButton(i18n("Delete..."),hbox)
         hbox.setStretchFactor(self.deletegroupbutton,1)
-        self.connect(self.deletegroupbutton,SIGNAL("clicked()"),self.slotDeleteGroupClicked)
+        self.connect(self.deletegroupbutton,TQ_SIGNAL("clicked()"),self.slotDeleteGroupClicked)
 
         if not isroot:
             disablebuttons = (  self.modifybutton, self.modifygroupbutton, self.deletebutton, self.deletegroupbutton,
@@ -649,7 +649,7 @@ class UserEditDialog(KDialogBase):
         self.loginnameedit.setValidator(LoginNameValidator(self.loginnameedit))
 
         infogrid.addWidget(self.loginnameedit,2,1)
-        self.connect(self.loginnameedit, SIGNAL("textChanged(const TQString &)"), self.slotLoginChanged)
+        self.connect(self.loginnameedit, TQ_SIGNAL("textChanged(const TQString &)"), self.slotLoginChanged)
 
         label = TQLabel(i18n("Real Name:"),detailspace)
         infogrid.addWidget(label,3,0)
@@ -676,10 +676,10 @@ class UserEditDialog(KDialogBase):
         hbox.setSpacing(self.spacingHint())
         self.homediredit = KLineEdit("",hbox)
         hbox.setStretchFactor(self.homediredit,1)
-        self.connect(self.homediredit, SIGNAL("textChanged(const TQString &)"), self.slotHomeDirChanged)
+        self.connect(self.homediredit, TQ_SIGNAL("textChanged(const TQString &)"), self.slotHomeDirChanged)
         self.homedirbutton = KPushButton(i18n("Browse..."),hbox)
         hbox.setStretchFactor(self.homedirbutton,0)
-        self.connect(self.homedirbutton,SIGNAL("clicked()"),self.slotBrowseHomeDirClicked)
+        self.connect(self.homedirbutton,TQ_SIGNAL("clicked()"),self.slotBrowseHomeDirClicked)
         infogrid.addWidget(hbox,7,1)
 
         label = TQLabel(i18n("Shell:"),detailspace)
@@ -754,7 +754,7 @@ class UserEditDialog(KDialogBase):
 
         self.validradiogroup.insert(self.validalwaysradio,0)
         self.validradiogroup.insert(self.expireradio,1)
-        self.connect(self.validradiogroup,SIGNAL("clicked(int)"),self.slotValidUntilClicked)
+        self.connect(self.validradiogroup,TQ_SIGNAL("clicked(int)"),self.slotValidUntilClicked)
 
         # Password Aging & Expiration.
         passwordaginggroup = TQVGroupBox(i18n("Password Aging"),passwordvbox)
@@ -768,7 +768,7 @@ class UserEditDialog(KDialogBase):
 
         # [*] Require new password after: [_____5 days]
         self.forcepasswordchangecheckbox = TQCheckBox(passwordagingwidget)
-        self.connect(self.forcepasswordchangecheckbox,SIGNAL("toggled(bool)"),self.slotForcePasswordChangeToggled)
+        self.connect(self.forcepasswordchangecheckbox,TQ_SIGNAL("toggled(bool)"),self.slotForcePasswordChangeToggled)
         passwordaginggrid.addWidget(self.forcepasswordchangecheckbox,0,0)
         label = TQLabel(i18n("Require new password after:"),passwordagingwidget)
         passwordaginggrid.addWidget(label,0,1)
@@ -799,7 +799,7 @@ class UserEditDialog(KDialogBase):
         passwordaginggrid.addWidget(self.disableexpireedit,2,2)
 
         self.enforcepasswordminagecheckbox = TQCheckBox(passwordagingwidget)
-        self.connect(self.enforcepasswordminagecheckbox,SIGNAL("toggled(bool)"),self.slotEnforePasswordAgeToggled)
+        self.connect(self.enforcepasswordminagecheckbox,TQ_SIGNAL("toggled(bool)"),self.slotEnforePasswordAgeToggled)
         passwordaginggrid.addWidget(self.enforcepasswordminagecheckbox,3,0)
 
         label = TQLabel(i18n("Enforce minimum password age:"),passwordagingwidget)
@@ -1276,10 +1276,10 @@ class ListPickerDialog(KDialogBase):
         spacer = TQWidget(vbox);
         vbox.setStretchFactor(spacer,1)
         self.addbutton = KPushButton(i18n("Add ->"),vbox)
-        self.connect(self.addbutton,SIGNAL("clicked()"),self.slotAddClicked)
+        self.connect(self.addbutton,TQ_SIGNAL("clicked()"),self.slotAddClicked)
         vbox.setStretchFactor(self.addbutton,0)
         self.removebutton = KPushButton(i18n("<- Remove"),vbox)
-        self.connect(self.removebutton,SIGNAL("clicked()"),self.slotRemoveClicked)
+        self.connect(self.removebutton,TQ_SIGNAL("clicked()"),self.slotRemoveClicked)
         vbox.setStretchFactor(self.removebutton,0)
         spacer = TQWidget(vbox);
         vbox.setStretchFactor(spacer,1)
@@ -1403,12 +1403,12 @@ class UserDeleteDialog(KDialog):
 
         okbutton = TQPushButton(i18n("OK"),buttonbox)
         buttonbox.setStretchFactor(okbutton,0)
-        self.connect(okbutton,SIGNAL("clicked()"),self.slotOkClicked)
+        self.connect(okbutton,TQ_SIGNAL("clicked()"),self.slotOkClicked)
 
         cancelbutton = TQPushButton(i18n("Cancel"),buttonbox)
         cancelbutton.setDefault(True)
         buttonbox.setStretchFactor(cancelbutton,0)
-        self.connect(cancelbutton,SIGNAL("clicked()"),self.slotCancelClicked)
+        self.connect(cancelbutton,TQ_SIGNAL("clicked()"),self.slotCancelClicked)
 
     def deleteUser(self,userid):
         # Setup the
@@ -1499,12 +1499,12 @@ class OverwriteHomeDirectoryDialog(KDialog):
 
         okbutton = TQPushButton(i18n("OK"),buttonbox)
         buttonbox.setStretchFactor(okbutton,0)
-        self.connect(okbutton,SIGNAL("clicked()"),self.slotOkClicked)
+        self.connect(okbutton,TQ_SIGNAL("clicked()"),self.slotOkClicked)
 
         cancelbutton = TQPushButton(i18n("Cancel"),buttonbox)
         cancelbutton.setDefault(True)
         buttonbox.setStretchFactor(cancelbutton,0)
-        self.connect(cancelbutton,SIGNAL("clicked()"),self.slotCancelClicked)
+        self.connect(cancelbutton,TQ_SIGNAL("clicked()"),self.slotCancelClicked)
 
     def do(self,userobj):
         # Setup the
@@ -1577,10 +1577,10 @@ class GroupEditDialog(KDialogBase):
         spacer = TQWidget(vbox);
         vbox.setStretchFactor(spacer,1)
         self.addbutton = KPushButton(i18n("Add ->"),vbox)
-        self.connect(self.addbutton,SIGNAL("clicked()"),self.slotAddClicked)
+        self.connect(self.addbutton,TQ_SIGNAL("clicked()"),self.slotAddClicked)
         vbox.setStretchFactor(self.addbutton,0)
         self.removebutton = KPushButton(i18n("<- Remove"),vbox)
-        self.connect(self.removebutton,SIGNAL("clicked()"),self.slotRemoveClicked)
+        self.connect(self.removebutton,TQ_SIGNAL("clicked()"),self.slotRemoveClicked)
         vbox.setStretchFactor(self.removebutton,0)
         spacer = TQWidget(vbox);
         vbox.setStretchFactor(spacer,1)