Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

18 files changed, 107 insertions, 107 deletions

diff --git a/superkaramba/src/datesensor.cpp b/superkaramba/src/datesensor.cpp
index 6adef6d..24e4675 100644
--- a/superkaramba/src/datesensor.cpp
+++ b/superkaramba/src/datesensor.cpp
@@ -87,7 +87,7 @@ void DateSensor::toggleCalendar(TQMouseEvent *ev)
 				hidden = false;
 				cal = new DatePicker(0);
 
-				connect(cal, TQT_SIGNAL(destroyed()), TQT_SLOT(slotCalendarDeleted()));
+				connect(cal, TQ_SIGNAL(destroyed()), TQ_SLOT(slotCalendarDeleted()));
 				TQPoint c = (TQPoint(ev->x(), ev->y()));
 
 				int w = cal->sizeHint().width();
diff --git a/superkaramba/src/disksensor.cpp b/superkaramba/src/disksensor.cpp
index e16d415..50f23ff 100644
--- a/superkaramba/src/disksensor.cpp
+++ b/superkaramba/src/disksensor.cpp
@@ -18,10 +18,10 @@
 
 DiskSensor::DiskSensor( int msec ) : Sensor( msec )
 {
-    connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
-            this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int )));
-    connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)),
-            this,TQT_SLOT(processExited( TDEProcess * )));
+    connect(&ksp, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+            this,TQ_SLOT(receivedStdout(TDEProcess *, char *, int )));
+    connect(&ksp, TQ_SIGNAL(processExited(TDEProcess *)),
+            this,TQ_SLOT(processExited( TDEProcess * )));
 
     // update values on startup
     ksp.clearArguments();
diff --git a/superkaramba/src/imagelabel.cpp b/superkaramba/src/imagelabel.cpp
index 2edac34..4b934a9 100644
--- a/superkaramba/src/imagelabel.cpp
+++ b/superkaramba/src/imagelabel.cpp
@@ -39,7 +39,7 @@ Effect::Effect(ImageLabel* img, int msec) :
   if (msec > 0)
   {
     // remove the effect after the given time
-    //TQTimer::singleShot (millisec, myImage, TQT_SLOT(slotEffectExpired()));
+    //TQTimer::singleShot (millisec, myImage, TQ_SLOT(slotEffectExpired()));
     //timer -> changeInterval(millisec);
     millisec = msec;
   }
@@ -57,7 +57,7 @@ void Effect::startTimer()
 {
   if (millisec > 0)
   {
-    TQTimer::singleShot (millisec, myImage, TQT_SLOT(slotEffectExpired()));
+    TQTimer::singleShot (millisec, myImage, TQ_SLOT(slotEffectExpired()));
     millisec = 0;
   }
 }
@@ -287,8 +287,8 @@ void ImageLabel::setValue(TQString fn)
     KTempFile tmpFile;
     TDEIO::FileCopyJob* copy = TDEIO::file_copy(fileName, tmpFile.name(), 0600,
                                             true, false, false);
-    connect(copy, TQT_SIGNAL(result(TDEIO::Job*)),
-            this, TQT_SLOT(slotCopyResult(TDEIO::Job*)));
+    connect(copy, TQ_SIGNAL(result(TDEIO::Job*)),
+            this, TQ_SLOT(slotCopyResult(TDEIO::Job*)));
     return;
   }
   else
diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp
index ebd7f2f..d4a74f7 100644
--- a/superkaramba/src/karamba.cpp
+++ b/superkaramba/src/karamba.cpp
@@ -77,7 +77,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
   if(!m_theme.set(url))
   {
     setFixedSize(0, 0);
-    TQTimer::singleShot(100, this, TQT_SLOT(killWidget()));
+    TQTimer::singleShot(100, this, TQ_SLOT(killWidget()));
     return;
   }
   // Add self to list of open themes
@@ -93,8 +93,8 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
   setName(qName.ascii());
 
   KDirWatch *dirWatch = KDirWatch::self();
-  connect(dirWatch, TQT_SIGNAL( dirty( const TQString & ) ),
-          TQT_SLOT( slotFileChanged( const TQString & ) ) );
+  connect(dirWatch, TQ_SIGNAL( dirty( const TQString & ) ),
+          TQ_SLOT( slotFileChanged( const TQString & ) ) );
 
   if(!dirWatch->contains(m_theme.file()))
     dirWatch->addFile(m_theme.file());
@@ -132,7 +132,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
   if(m_theme.pythonModuleExists())
   {
     kdDebug() << "Loading python module: " << m_theme.pythonModule() << endl;
-    TQTimer::singleShot(0, this, TQT_SLOT(initPythonInterface()));
+    TQTimer::singleShot(0, this, TQ_SLOT(initPythonInterface()));
   }
 
   widgetMask = 0;
@@ -142,22 +142,22 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
   kWinModule = new KWinModule();
   desktop = 0;
 
-  connect( kWinModule,TQT_SIGNAL(currentDesktopChanged(int)), this,
-           TQT_SLOT(currentDesktopChanged(int)) );
-  connect( kapp, TQT_SIGNAL(backgroundChanged(int)), this,
-           TQT_SLOT(currentWallpaperChanged(int)));
+  connect( kWinModule,TQ_SIGNAL(currentDesktopChanged(int)), this,
+           TQ_SLOT(currentDesktopChanged(int)) );
+  connect( kapp, TQ_SIGNAL(backgroundChanged(int)), this,
+           TQ_SLOT(currentWallpaperChanged(int)));
 
   // Setup of the Task Manager Callbacks
-  connect(&taskManager, TQT_SIGNAL(activeTaskChanged(Task*)), this,
-           TQT_SLOT(activeTaskChanged(Task*)) );
-  connect(&taskManager, TQT_SIGNAL(taskAdded(Task*)), this,
-           TQT_SLOT(taskAdded(Task*)) );
-  connect(&taskManager, TQT_SIGNAL(taskRemoved(Task*)), this,
-           TQT_SLOT(taskRemoved(Task*)) );
-  connect(&taskManager, TQT_SIGNAL(startupAdded(Startup*)), this,
-           TQT_SLOT(startupAdded(Startup*)) );
-  connect(&taskManager, TQT_SIGNAL(startupRemoved(Startup*)), this,
-           TQT_SLOT(startupRemoved(Startup*)) );
+  connect(&taskManager, TQ_SIGNAL(activeTaskChanged(Task*)), this,
+           TQ_SLOT(activeTaskChanged(Task*)) );
+  connect(&taskManager, TQ_SIGNAL(taskAdded(Task*)), this,
+           TQ_SLOT(taskAdded(Task*)) );
+  connect(&taskManager, TQ_SIGNAL(taskRemoved(Task*)), this,
+           TQ_SLOT(taskRemoved(Task*)) );
+  connect(&taskManager, TQ_SIGNAL(startupAdded(Startup*)), this,
+           TQ_SLOT(startupAdded(Startup*)) );
+  connect(&taskManager, TQ_SIGNAL(startupRemoved(Startup*)), this,
+           TQ_SLOT(startupRemoved(Startup*)) );
 
   themeConfMenu = new TDEPopupMenu( this);
   themeConfMenu -> setCheckable(true);
@@ -171,7 +171,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
   toDesktopMenu -> setCheckable(true);
   mid = toDesktopMenu -> insertItem (i18n("&All Desktops"),
                                      dslot = new DesktopChangeSlot(this,0),
-                                     TQT_SLOT(receive()));
+                                     TQ_SLOT(receive()));
   dslot->setMenuId(mid);
 
   toDesktopMenu -> insertSeparator();
@@ -181,7 +181,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
     name += ('0' + ndesktop);
 
     mid = toDesktopMenu -> insertItem (name,
-        dslot = new DesktopChangeSlot(this, ndesktop), TQT_SLOT(receive()));
+        dslot = new DesktopChangeSlot(this, ndesktop), TQ_SLOT(receive()));
     dslot->setMenuId(mid);
   }
 
@@ -193,11 +193,11 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
   menuAccColl = new TDEActionCollection( this );
 
   kpop->insertItem( SmallIconSet("reload"),i18n("Update"), this,
-                    TQT_SLOT(updateSensors()), Key_F5 );
+                    TQ_SLOT(updateSensors()), Key_F5 );
   toggleLocked = new TDEToggleAction (  i18n("Toggle &Locked Position"),
                                       SmallIconSet("locked"),
                                       CTRL+Key_L, this,
-                                      TQT_SLOT( slotToggleLocked() ),
+                                      TQ_SLOT( slotToggleLocked() ),
                                       accColl, "Locked position" );
   accColl->insert(toggleLocked);
   toggleLocked -> setChecked(true);
@@ -206,7 +206,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
 
   toggleFastTransforms = new TDEToggleAction(i18n("Use &Fast Image Scaling"),
                          CTRL+Key_F, this,
-                         TQT_SLOT( slotToggleFastTransforms() ),
+                         TQ_SLOT( slotToggleFastTransforms() ),
                          accColl, "Fast transformations");
 
   accColl->insert(toggleFastTransforms);
@@ -221,9 +221,9 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
   kpop->insertItem(i18n("To Des&ktop"), toDesktopMenu);
 
   kpop->insertItem( SmallIconSet("reload3"),i18n("&Reload Theme"),this,
-                    TQT_SLOT(reloadConfig()), CTRL+Key_R );
+                    TQ_SLOT(reloadConfig()), CTRL+Key_R );
   kpop->insertItem( SmallIconSet("window-close"),i18n("&Close This Theme"), this,
-                    TQT_SLOT(killWidget()), CTRL+Key_C );
+                    TQ_SLOT(killWidget()), CTRL+Key_C );
 
   if(!SuperKarambaSettings::showSysTray())
     showMenuExtension();
@@ -262,7 +262,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
   if( !parseConfig() )
   {
     setFixedSize(0,0);
-    TQTimer::singleShot( 100, this, TQT_SLOT(killWidget()) );
+    TQTimer::singleShot( 100, this, TQ_SLOT(killWidget()) );
     tqWarning("Could not read config file.");
   }
   else
@@ -605,7 +605,7 @@ bool karamba::parseConfig()
         if (!tiptext.isEmpty())
           tmp->setTooltip(tiptext);
 
-        connect(tmp, TQT_SIGNAL(pixmapLoaded()), this, TQT_SLOT(externalStep()));
+        connect(tmp, TQ_SIGNAL(pixmapLoaded()), this, TQ_SLOT(externalStep()));
         setSensor(lineParser, (Meter*) tmp );
         meterList->append (tmp );
         imageList->append (tmp );
@@ -790,12 +790,12 @@ void karamba::start()
 {
   m_sysTimer = new TQTimer(this);
 
-  connect(m_sysTimer, TQT_SIGNAL(timeout()), TQT_SLOT(step()));
+  connect(m_sysTimer, TQ_SIGNAL(timeout()), TQ_SLOT(step()));
 
   m_sysTimer->start(m_interval);
 
     //Start the widget running
-  TQTimer::singleShot( 0, this, TQT_SLOT(step()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(step()) );
 
   if( !(onTop || managed) )
     lowerTimer.start();
@@ -1015,7 +1015,7 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter)
       int interval = lineParser.getInt("INTERVAL");
       interval = (interval == 0)?5000:interval;
       sensor = ( sensorMap["DISK"] = new DiskSensor( interval ) );
-      connect( sensor, TQT_SIGNAL(initComplete()), this, TQT_SLOT(externalStep()) );
+      connect( sensor, TQ_SIGNAL(initComplete()), this, TQ_SLOT(externalStep()) );
       sensorList->append( sensor );
     }
     // meter->setMax( ((DiskSensor*)sensor)->getTotalSpace(mntPt)/1024 );
@@ -1216,7 +1216,7 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter)
 
   if (sensor != 0)
   {
-    TQTimer::singleShot( 0, sensor, TQT_SLOT(update()) );
+    TQTimer::singleShot( 0, sensor, TQ_SLOT(update()) );
     sensor->start();
   }
 }
@@ -1560,7 +1560,7 @@ void karamba::updateSensors()
     ((Sensor*) *it)->update();
     ++it;
   }
-  TQTimer::singleShot( 500, this, TQT_SLOT(step()) );
+  TQTimer::singleShot( 500, this, TQ_SLOT(step()) );
 }
 
 void karamba::updateBackground(TDESharedPixmap* kpm)
@@ -1780,14 +1780,14 @@ void karamba::addMenuConfigOption(TQString key, TQString name)
 
   SignalBridge* action = new SignalBridge(this, key, menuAccColl);
   TDEToggleAction* confItem = new TDEToggleAction (name, TDEShortcut::null(),
-                                               action, TQT_SLOT(receive()),
+                                               action, TQ_SLOT(receive()),
                                                menuAccColl, key.ascii());
   confItem -> setName(key.ascii());
 
   menuAccColl -> insert(confItem);
 
-  connect(action, TQT_SIGNAL( enabled(TQString, bool) ),
-          this, TQT_SLOT( slotToggleConfigOption(TQString, bool) ));
+  connect(action, TQ_SIGNAL( enabled(TQString, bool) ),
+          this, TQ_SLOT( slotToggleConfigOption(TQString, bool) ));
 
   config -> setGroup("config menu");
   confItem -> setChecked(config -> readBoolEntry(key));
@@ -2034,16 +2034,16 @@ void karamba::showMenuExtension()
 
   trayMenuToggleId = kglobal->insertItem(SmallIconSet("superkaramba"),
                                          i18n("Show System Tray Icon"), this,
-                                         TQT_SLOT(slotToggleSystemTray()),
+                                         TQ_SLOT(slotToggleSystemTray()),
                                          CTRL+Key_S);
 
   trayMenuThemeId = kglobal->insertItem(SmallIconSet("knewstuff"),
                                         i18n("&Manage Themes..."), this,
-                                        TQT_SLOT(slotShowTheme()), CTRL+Key_M);
+                                        TQ_SLOT(slotShowTheme()), CTRL+Key_M);
 
   trayMenuQuitId = kglobal->insertItem(SmallIconSet("system-log-out"),
                                        i18n("&Quit SuperKaramba"), this,
-                                       TQT_SLOT(slotQuit()), CTRL+Key_Q);
+                                       TQ_SLOT(slotQuit()), CTRL+Key_Q);
 
   kglobal->polish();
 
diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp
index 79d7d42..b4bf15c 100644
--- a/superkaramba/src/karambaapp.cpp
+++ b/superkaramba/src/karambaapp.cpp
@@ -141,17 +141,17 @@ void KarambaApplication::setUpSysTray(TDEAboutData* about)
   TDEPopupMenu *menu = sysTrayIcon->contextMenu();
   menu->insertItem(SmallIconSet("superkaramba"),
                    i18n("Hide System Tray Icon"), this,
-                   TQT_SLOT(globalHideSysTray()));
+                   TQ_SLOT(globalHideSysTray()));
   menu->insertSeparator();
 
   m_helpMenu = new KHelpMenu(themeListWindow, about);
-  action = KStdAction::help(m_helpMenu, TQT_SLOT(appHelpActivated()),
+  action = KStdAction::help(m_helpMenu, TQ_SLOT(appHelpActivated()),
                             sysTrayIcon->actionCollection());
   action->plug(menu);
-  action = KStdAction::aboutApp(m_helpMenu, TQT_SLOT(aboutApplication()),
+  action = KStdAction::aboutApp(m_helpMenu, TQ_SLOT(aboutApplication()),
                                 sysTrayIcon->actionCollection());
   action->plug(menu);
-  action = KStdAction::aboutKDE(m_helpMenu, TQT_SLOT(aboutKDE()),
+  action = KStdAction::aboutKDE(m_helpMenu, TQ_SLOT(aboutKDE()),
                                 sysTrayIcon->actionCollection());
   action->plug(menu);
 
@@ -164,8 +164,8 @@ void KarambaApplication::setUpSysTray(TDEAboutData* about)
     sysTrayIcon->hide();
 
   //Connect Systray icon's quit event
-  TQObject::connect(sysTrayIcon, TQT_SIGNAL(quitSelected()),
-                   this, TQT_SLOT(globalQuitSuperKaramba()));
+  TQObject::connect(sysTrayIcon, TQ_SIGNAL(quitSelected()),
+                   this, TQ_SLOT(globalQuitSuperKaramba()));
 }
 
 void KarambaApplication::showKarambaMenuExtension(bool show)
diff --git a/superkaramba/src/kwidgetlistbox.cpp b/superkaramba/src/kwidgetlistbox.cpp
index 1811f38..56e0769 100644
--- a/superkaramba/src/kwidgetlistbox.cpp
+++ b/superkaramba/src/kwidgetlistbox.cpp
@@ -33,8 +33,8 @@ KWidgetListbox::KWidgetListbox(TQWidget *parent, const char *name)
   verticalHeader()->hide();
   setSelectionMode(TQTable::NoSelection);
   setFocusStyle(TQTable::FollowStyle);
-  connect(this, TQT_SIGNAL(currentChanged(int, int)),
-          this, TQT_SLOT(selectionChanged(int, int)));
+  connect(this, TQ_SIGNAL(currentChanged(int, int)),
+          this, TQ_SLOT(selectionChanged(int, int)));
   setHScrollBarMode(TQScrollView::AlwaysOff);
   setVScrollBarMode(TQScrollView::Auto);
 }
diff --git a/superkaramba/src/main.cpp b/superkaramba/src/main.cpp
index 6196983..d336bd4 100644
--- a/superkaramba/src/main.cpp
+++ b/superkaramba/src/main.cpp
@@ -128,7 +128,7 @@ int main(int argc, char **argv)
 
     KarambaApplication::unlockKaramba();
 
-    app.connect(tqApp,TQT_SIGNAL(lastWindowClosed()),tqApp,TQT_SLOT(quit()));
+    app.connect(tqApp,TQ_SIGNAL(lastWindowClosed()),tqApp,TQ_SLOT(quit()));
 
     // Try to restore a previous session if applicable.
     app.checkPreviousSession(app, lst);
diff --git a/superkaramba/src/memsensor.cpp b/superkaramba/src/memsensor.cpp
index 98eceea..1d6c4dc 100644
--- a/superkaramba/src/memsensor.cpp
+++ b/superkaramba/src/memsensor.cpp
@@ -57,10 +57,10 @@ MemSensor::MemSensor(int msec) : Sensor(msec)
 # if defined(Q_OS_FREEBSD) && defined(__FreeBSD_version) && __FreeBSD_version >= 500018
     kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, "kvm_open");
 # elif defined Q_OS_FREEBSD
-    connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
-            this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int )));
-    connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)),
-            this,TQT_SLOT(processExited( TDEProcess * )));
+    connect(&ksp, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+            this,TQ_SLOT(receivedStdout(TDEProcess *, char *, int )));
+    connect(&ksp, TQ_SIGNAL(processExited(TDEProcess *)),
+            this,TQ_SLOT(processExited( TDEProcess * )));
 
     swapTotal = swapUsed = 0;
 
diff --git a/superkaramba/src/menu_python.cpp b/superkaramba/src/menu_python.cpp
index c42a009..bc5d9e3 100644
--- a/superkaramba/src/menu_python.cpp
+++ b/superkaramba/src/menu_python.cpp
@@ -40,8 +40,8 @@ long createMenu(long widget)
   TDEPopupMenu* tmp = new TDEPopupMenu(currTheme);
   currTheme->menuList->append( tmp );
 
-  currTheme->connect(tmp, TQT_SIGNAL(activated(int)), currTheme,
-                     TQT_SLOT(passMenuItemClicked(int)));
+  currTheme->connect(tmp, TQ_SIGNAL(activated(int)), currTheme,
+                     TQ_SLOT(passMenuItemClicked(int)));
 
   return (long)tmp;
 }
diff --git a/superkaramba/src/misc_python.cpp b/superkaramba/src/misc_python.cpp
index 271ec51..5f60ff0 100644
--- a/superkaramba/src/misc_python.cpp
+++ b/superkaramba/src/misc_python.cpp
@@ -149,13 +149,13 @@ PyObject* py_execute_command_interactive(PyObject *, PyObject* args)
 
   }
   TQApplication::connect(currTheme->currProcess,
-                        TQT_SIGNAL(processExited(TDEProcess *)),
+                        TQ_SIGNAL(processExited(TDEProcess *)),
                         currTheme,
-                        TQT_SLOT(processExited(TDEProcess *)));
+                        TQ_SLOT(processExited(TDEProcess *)));
   TQApplication::connect(currTheme->currProcess,
-                        TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+                        TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
                         currTheme,
-                        TQT_SLOT(receivedStdout(TDEProcess *, char *, int)));
+                        TQ_SLOT(receivedStdout(TDEProcess *, char *, int)));
   currTheme->currProcess->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
 
   return Py_BuildValue((char*)"l", (int)(currTheme->currProcess->pid()));
diff --git a/superkaramba/src/programsensor.cpp b/superkaramba/src/programsensor.cpp
index 0c2f3e2..6bae664 100644
--- a/superkaramba/src/programsensor.cpp
+++ b/superkaramba/src/programsensor.cpp
@@ -25,10 +25,10 @@ ProgramSensor::ProgramSensor(const TQString &progName, int interval, TQString en
 
     programName = progName;
     //update();
-    connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
-            this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int )));
-    connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)),
-            this,TQT_SLOT(processExited( TDEProcess * )));
+    connect(&ksp, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+            this,TQ_SLOT(receivedStdout(TDEProcess *, char *, int )));
+    connect(&ksp, TQ_SIGNAL(processExited(TDEProcess *)),
+            this,TQ_SLOT(processExited( TDEProcess * )));
 }
 
 ProgramSensor::~ProgramSensor()
diff --git a/superkaramba/src/sensor.cpp b/superkaramba/src/sensor.cpp
index 378cb1d..8655754 100644
--- a/superkaramba/src/sensor.cpp
+++ b/superkaramba/src/sensor.cpp
@@ -19,7 +19,7 @@ void Sensor::start()
 {
     if (!timer.isActive())
     {
-        connect (&timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(update()));
+        connect (&timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(update()));
         timer.start( (msec == 0)?1000:msec);
     }
 }
diff --git a/superkaramba/src/sensorsensor.cpp b/superkaramba/src/sensorsensor.cpp
index baea31d..2998ba4 100644
--- a/superkaramba/src/sensorsensor.cpp
+++ b/superkaramba/src/sensorsensor.cpp
@@ -29,10 +29,10 @@ SensorSensor::SensorSensor(int interval, char tempUnit) : Sensor( interval )
 #endif
     if(tempUnit == 'F')
       extraParams = " -f";
-    connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
-            this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int )));
-    connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)),
-            this,TQT_SLOT(processExited( TDEProcess * )));
+    connect(&ksp, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+            this,TQ_SLOT(receivedStdout(TDEProcess *, char *, int )));
+    connect(&ksp, TQ_SIGNAL(processExited(TDEProcess *)),
+            this,TQ_SLOT(processExited( TDEProcess * )));
 
     // readValues();
 }
diff --git a/superkaramba/src/showdesktop.cpp b/superkaramba/src/showdesktop.cpp
index 57d1f46..1259288 100644
--- a/superkaramba/src/showdesktop.cpp
+++ b/superkaramba/src/showdesktop.cpp
@@ -40,10 +40,10 @@ ShowDesktop::ShowDesktop()
     kWinModule = new KWinModule( this );
 
     // on desktop changes or when a window is deiconified, we abort the show desktop mode
-    connect( kWinModule, TQT_SIGNAL(currentDesktopChanged(int)),
-             TQT_SLOT(slotCurrentDesktopChanged(int)));
-    connect( kWinModule, TQT_SIGNAL(windowChanged(WId,unsigned int)),
-             TQT_SLOT(slotWindowChanged(WId,unsigned int)));
+    connect( kWinModule, TQ_SIGNAL(currentDesktopChanged(int)),
+             TQ_SLOT(slotCurrentDesktopChanged(int)));
+    connect( kWinModule, TQ_SIGNAL(windowChanged(WId,unsigned int)),
+             TQ_SLOT(slotWindowChanged(WId,unsigned int)));
 }
 
 void ShowDesktop::slotCurrentDesktopChanged(int)
diff --git a/superkaramba/src/systemtray.cpp b/superkaramba/src/systemtray.cpp
index f8397de..ea93889 100644
--- a/superkaramba/src/systemtray.cpp
+++ b/superkaramba/src/systemtray.cpp
@@ -95,7 +95,7 @@ void Systemtray::initSystray( void )
 
     emb->setAutoDelete(false);
 
-    connect(emb, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(updateTrayWindows()));
+    connect(emb, TQ_SIGNAL(embeddedWindowDestroyed()), TQ_SLOT(updateTrayWindows()));
 
     m_Wins.append(emb);
 
@@ -107,8 +107,8 @@ void Systemtray::initSystray( void )
 
   updateTrayWindows();
 
-  connect(twin_module, TQT_SIGNAL(systemTrayWindowAdded(WId)), TQT_SLOT(systemTrayWindowAdded(WId)));
-  connect(twin_module, TQT_SIGNAL(systemTrayWindowRemoved(WId)), TQT_SLOT(systemTrayWindowRemoved(WId)));
+  connect(twin_module, TQ_SIGNAL(systemTrayWindowAdded(WId)), TQ_SLOT(systemTrayWindowAdded(WId)));
+  connect(twin_module, TQ_SIGNAL(systemTrayWindowRemoved(WId)), TQ_SLOT(systemTrayWindowRemoved(WId)));
 
   TQCString screenstr;
   screenstr.setNum(tqt_xscreen());
@@ -206,7 +206,7 @@ void Systemtray::systemTrayWindowAdded( WId w )
   emb->setAutoDelete(false);
   //emb->setBackgroundMode(X11ParentRelative);
   emb->setBackgroundMode(FixedPixmap);
-  connect(emb, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(updateTrayWindows()));
+  connect(emb, TQ_SIGNAL(embeddedWindowDestroyed()), TQ_SLOT(updateTrayWindows()));
   m_Wins.append(emb);
 
   emb->embed(w);
diff --git a/superkaramba/src/systray_python.cpp b/superkaramba/src/systray_python.cpp
index c953fdb..e0d96a1 100644
--- a/superkaramba/src/systray_python.cpp
+++ b/superkaramba/src/systray_python.cpp
@@ -111,8 +111,8 @@ long createSystray(long widget, long x, long y, long w, long h)
     currTheme->systray->move((int)x,(int)y);
     currTheme->systray->setMinimumSize((int)w,(int)h);
     currTheme->systray->initSystray();
-    TQObject::connect(currTheme->systray,TQT_SIGNAL(updated()),
-                     currTheme,TQT_SLOT(systrayUpdated()));
+    TQObject::connect(currTheme->systray,TQ_SIGNAL(updated()),
+                     currTheme,TQ_SLOT(systrayUpdated()));
     currTheme->systray->show();
   }
 
diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp
index e58f9b3..b666d28 100644
--- a/superkaramba/src/taskmanager.cpp
+++ b/superkaramba/src/taskmanager.cpp
@@ -55,11 +55,11 @@ TaskManager::TaskManager(TQObject *parent, const char *name)
     twin_module = new KWinModule();
 
 //    TDEGlobal::locale()->insertCatalogue("libtaskmanager");
-    connect(twin_module, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId)));
-    connect(twin_module, TQT_SIGNAL(windowRemoved(WId)), TQT_SLOT(windowRemoved(WId)));
-    connect(twin_module, TQT_SIGNAL(activeWindowChanged(WId)), TQT_SLOT(activeWindowChanged(WId)));
-    connect(twin_module, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(currentDesktopChanged(int)));
-    connect(twin_module, TQT_SIGNAL(windowChanged(WId,unsigned int)), TQT_SLOT(windowChanged(WId,unsigned int)));
+    connect(twin_module, TQ_SIGNAL(windowAdded(WId)), TQ_SLOT(windowAdded(WId)));
+    connect(twin_module, TQ_SIGNAL(windowRemoved(WId)), TQ_SLOT(windowRemoved(WId)));
+    connect(twin_module, TQ_SIGNAL(activeWindowChanged(WId)), TQ_SLOT(activeWindowChanged(WId)));
+    connect(twin_module, TQ_SIGNAL(currentDesktopChanged(int)), TQ_SLOT(currentDesktopChanged(int)));
+    connect(twin_module, TQ_SIGNAL(windowChanged(WId,unsigned int)), TQ_SLOT(windowChanged(WId,unsigned int)));
 
     // register existing windows
     const TQValueList<WId> windows = twin_module->windows();
@@ -86,14 +86,14 @@ void TaskManager::configure_startup()
         return;
     _startup_info = new TDEStartupInfo( true, this );
     connect( _startup_info,
-        TQT_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
-        TQT_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )));
+        TQ_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQ_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )));
     connect( _startup_info,
-        TQT_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )),
-        TQT_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )));
+        TQ_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQ_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )));
     connect( _startup_info,
-        TQT_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
-        TQT_SLOT( gotRemoveStartup( const TDEStartupInfoId& )));
+        TQ_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQ_SLOT( gotRemoveStartup( const TDEStartupInfoId& )));
     c.setGroup( "TaskbarButtonSettings" );
     _startup_info->setTimeout( c.readUnsignedNumEntry( "Timeout", 30 ));
 }
@@ -780,7 +780,7 @@ void Task::updateThumbnail()
         geom.width(), geom.height() );
 
    if ( !_grab.isNull() )
-     TQTimer::singleShot( 200, this, TQT_SLOT( generateThumbnail() ) );
+     TQTimer::singleShot( 200, this, TQ_SLOT( generateThumbnail() ) );
 }
 
 void Task::generateThumbnail()
diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp
index 7534054..4d79048 100644
--- a/superkaramba/src/themesdlg.cpp
+++ b/superkaramba/src/themesdlg.cpp
@@ -134,8 +134,8 @@ void ThemesDlg::populateListbox()
   item->buttonGo->setText(i18n("New Stuff..."));
 #ifdef HAVE_TDENEWSTUFF
   item->buttonGo->setEnabled(true);
-  connect(item->buttonGo, TQT_SIGNAL(clicked()),
-          this, TQT_SLOT(getNewStuff()));
+  connect(item->buttonGo, TQ_SIGNAL(clicked()),
+          this, TQ_SLOT(getNewStuff()));
 #else
   item->buttonGo->setEnabled(false);
 #endif
@@ -148,8 +148,8 @@ void ThemesDlg::populateListbox()
   item->setDescriptionText(i18n("Add local theme to the list."));
   item->buttonGo->setProperty("stdItem", 18);
   item->buttonGo->setText(i18n("Open..."));
-  connect(item->buttonGo, TQT_SIGNAL(clicked()),
-          this, TQT_SLOT(openLocalTheme()));
+  connect(item->buttonGo, TQ_SIGNAL(clicked()),
+          this, TQ_SLOT(openLocalTheme()));
   tableThemes->insertItem(item);
 
   dirs = ksd.findDirs("data", TQString(kapp->name()) + "/themes");
@@ -164,8 +164,8 @@ void ThemesDlg::populateListbox()
       item = new ThemeWidget(new ThemeFile(dir.filePath(*it)));
       tableThemes->insertItem(item);
       item->buttonGo->setText(i18n("Uninstall"));
-      connect(item->buttonGo, TQT_SIGNAL(clicked()),
-              this, TQT_SLOT(uninstall()));
+      connect(item->buttonGo, TQ_SIGNAL(clicked()),
+              this, TQ_SLOT(uninstall()));
     }
   }
   t = SuperKarambaSettings::userAddedThemes();
@@ -178,8 +178,8 @@ void ThemesDlg::populateListbox()
       item = new ThemeWidget(file);
       tableThemes->insertItem(item);
       item->buttonGo->setText(i18n("Uninstall"));
-      connect(item->buttonGo, TQT_SIGNAL(clicked()),
-              this, TQT_SLOT(uninstall()));
+      connect(item->buttonGo, TQ_SIGNAL(clicked()),
+              this, TQ_SLOT(uninstall()));
     }
     else
       delete file;
@@ -363,8 +363,8 @@ int ThemesDlg::addThemeToList(const TQString &file)
 
     i = tableThemes->insertItem(item);
     item->buttonGo->setText(i18n("Uninstall"));
-    connect(item->buttonGo, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(uninstall()));
+    connect(item->buttonGo, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(uninstall()));
   }
   tableThemes->setSelected(i);
   return i;