Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 38 insertions, 38 deletions

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();