Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

3 files changed, 40 insertions, 40 deletions

diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp
index 3286c8576..79c809e39 100644
--- a/kicker/taskmanager/tasklmbmenu.cpp
+++ b/kicker/taskmanager/tasklmbmenu.cpp
@@ -99,7 +99,7 @@ TaskLMBMenu::TaskLMBMenu(const Task::List& tasks, TQWidget *parent, const char *
     setAcceptDrops(true); // Always enabled to activate task during drag&drop.
 
     m_dragSwitchTimer = new TQTimer(this, "DragSwitchTimer");
-    connect(m_dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(dragSwitch()));
+    connect(m_dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(dragSwitch()));
 }
 
 void TaskLMBMenu::fillMenu()
@@ -118,7 +118,7 @@ void TaskLMBMenu::fillMenu()
                                                   t->isIconified(),
                                                   t->demandsAttention());
         int id = insertItem(TQIconSet(t->pixmap()), menuItem);
-        connectItem(id, t, TQT_SLOT(activateRaiseOrIconify()));
+        connectItem(id, t, TQ_SLOT(activateRaiseOrIconify()));
         setItemChecked(id, t->isActive());
 
         if (t->demandsAttention())
@@ -131,7 +131,7 @@ void TaskLMBMenu::fillMenu()
     if (m_attentionState)
     {
         m_attentionTimer = new TQTimer(this, "AttentionTimer");
-        connect(m_attentionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(attentionTimeout()));
+        connect(m_attentionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(attentionTimeout()));
         m_attentionTimer->start(500, true);
     }
 }
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index d4da190b6..54bf6d919 100644
--- a/kicker/taskmanager/taskmanager.cpp
+++ b/kicker/taskmanager/taskmanager.cpp
@@ -61,16 +61,16 @@ TaskManager::TaskManager()
       m_trackGeometry(false)
 {
     TDEGlobal::locale()->insertCatalogue("libtaskmanager");
-    connect(m_winModule, TQT_SIGNAL(windowAdded(WId)),
-            this,        TQT_SLOT(windowAdded(WId)));
-    connect(m_winModule, TQT_SIGNAL(windowRemoved(WId)),
-            this,        TQT_SLOT(windowRemoved(WId)));
-    connect(m_winModule, TQT_SIGNAL(activeWindowChanged(WId)),
-            this,        TQT_SLOT(activeWindowChanged(WId)));
-    connect(m_winModule, TQT_SIGNAL(currentDesktopChanged(int)),
-            this,        TQT_SLOT(currentDesktopChanged(int)));
-    connect(m_winModule, TQT_SIGNAL(windowChanged(WId,unsigned int)),
-            this,        TQT_SLOT(windowChanged(WId,unsigned int)));
+    connect(m_winModule, TQ_SIGNAL(windowAdded(WId)),
+            this,        TQ_SLOT(windowAdded(WId)));
+    connect(m_winModule, TQ_SIGNAL(windowRemoved(WId)),
+            this,        TQ_SLOT(windowRemoved(WId)));
+    connect(m_winModule, TQ_SIGNAL(activeWindowChanged(WId)),
+            this,        TQ_SLOT(activeWindowChanged(WId)));
+    connect(m_winModule, TQ_SIGNAL(currentDesktopChanged(int)),
+            this,        TQ_SLOT(currentDesktopChanged(int)));
+    connect(m_winModule, TQ_SIGNAL(windowChanged(WId,unsigned int)),
+            this,        TQ_SLOT(windowChanged(WId,unsigned int)));
 
     // register existing windows
     const TQValueList<WId> windows = m_winModule->windows();
@@ -99,14 +99,14 @@ void TaskManager::configure_startup()
         return;
     _startup_info = new TDEStartupInfo( TDEStartupInfo::CleanOnCantDetect, 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( killStartup( const TDEStartupInfoId& )));
+        TQ_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQ_SLOT( killStartup( const TDEStartupInfoId& )));
     c.setGroup( "TaskbarButtonSettings" );
     _startup_info->setTimeout( c.readUnsignedNumEntry( "Timeout", 30 ));
 }
@@ -1313,7 +1313,7 @@ void Task::updateThumbnail()
 
     if (!_grab.isNull())
     {
-       TQTimer::singleShot(200, this, TQT_SLOT(generateThumbnail()));
+       TQTimer::singleShot(200, this, TQ_SLOT(generateThumbnail()));
     }
 }
 
diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp
index cdc6e4532..943160d26 100644
--- a/kicker/taskmanager/taskrmbmenu.cpp
+++ b/kicker/taskmanager/taskrmbmenu.cpp
@@ -78,7 +78,7 @@ void TaskRMBMenu::fillMenu(Task::Ptr t)
         if (showAll)
         {
             id = insertItem(i18n("&To Current Desktop"),
-                            t, TQT_SLOT(toCurrentDesktop()));
+                            t, TQ_SLOT(toCurrentDesktop()));
             setItemEnabled( id, !t->isOnCurrentDesktop() );
         }
 
@@ -88,21 +88,21 @@ void TaskRMBMenu::fillMenu(Task::Ptr t)
         }
     }
 
-    id = insertItem(SmallIconSet("move"), i18n("&Move"), t, TQT_SLOT(move()));
+    id = insertItem(SmallIconSet("move"), i18n("&Move"), t, TQ_SLOT(move()));
     setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMove));
 
-    id = insertItem(i18n("Re&size"), t, TQT_SLOT(resize()));
+    id = insertItem(i18n("Re&size"), t, TQ_SLOT(resize()));
     setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionResize));
 
-    id = insertItem(i18n("Mi&nimize"), t, TQT_SLOT(toggleIconified()));
+    id = insertItem(i18n("Mi&nimize"), t, TQ_SLOT(toggleIconified()));
     setItemChecked(id, t->isIconified());
     setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMinimize));
 
-    id = insertItem(i18n("Ma&ximize"), t, TQT_SLOT(toggleMaximized()));
+    id = insertItem(i18n("Ma&ximize"), t, TQ_SLOT(toggleMaximized()));
     setItemChecked(id, t->isMaximized());
     setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMax));
 
-    id = insertItem(i18n("&Shade"), t, TQT_SLOT(toggleShaded()));
+    id = insertItem(i18n("&Shade"), t, TQ_SLOT(toggleShaded()));
     setItemChecked(id, t->isShaded());
     setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionShade));
 
@@ -115,7 +115,7 @@ void TaskRMBMenu::fillMenu(Task::Ptr t)
         insertSeparator();
     }
 
-    id = insertItem(SmallIcon("window-close"), i18n("&Close"), t, TQT_SLOT(close()));
+    id = insertItem(SmallIcon("window-close"), i18n("&Close"), t, TQ_SLOT(close()));
     setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionClose));
 }
 
@@ -133,7 +133,7 @@ void TaskRMBMenu::fillMenu()
                          t->visibleNameWithState(),
 		         new TaskRMBMenu(t, this) );
         setItemChecked( id, t->isActive() );
-        connectItem( id, t, TQT_SLOT( activateRaiseOrIconify() ) );
+        connectItem( id, t, TQ_SLOT( activateRaiseOrIconify() ) );
     }
 
     insertSeparator();
@@ -144,7 +144,7 @@ void TaskRMBMenu::fillMenu()
     {
         id = insertItem(i18n("All to &Desktop"), makeDesktopsMenu());
 
-        id = insertItem(i18n("All &to Current Desktop"), this, TQT_SLOT(slotAllToCurrentDesktop()));
+        id = insertItem(i18n("All &to Current Desktop"), this, TQ_SLOT(slotAllToCurrentDesktop()));
         Task::List::iterator itEnd = tasks.end();
         for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
         {
@@ -159,7 +159,7 @@ void TaskRMBMenu::fillMenu()
 
     enable = false;
 
-    id = insertItem( i18n( "Mi&nimize All" ), this, TQT_SLOT( slotMinimizeAll() ) );
+    id = insertItem( i18n( "Mi&nimize All" ), this, TQ_SLOT( slotMinimizeAll() ) );
     itEnd = tasks.end();
     for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
     {
@@ -172,7 +172,7 @@ void TaskRMBMenu::fillMenu()
 
     enable = false;
 
-    id = insertItem( i18n( "Ma&ximize All" ), this, TQT_SLOT( slotMaximizeAll() ) );
+    id = insertItem( i18n( "Ma&ximize All" ), this, TQ_SLOT( slotMaximizeAll() ) );
     itEnd = tasks.end();
     for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
     {
@@ -185,7 +185,7 @@ void TaskRMBMenu::fillMenu()
 
     enable = false;
 
-    id = insertItem( i18n( "&Restore All" ), this, TQT_SLOT( slotRestoreAll() ) );
+    id = insertItem( i18n( "&Restore All" ), this, TQ_SLOT( slotRestoreAll() ) );
     itEnd = tasks.end();
     for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
     {
@@ -207,7 +207,7 @@ void TaskRMBMenu::fillMenu()
         insertSeparator();
     }
 
-    insertItem( SmallIcon( "window-close" ), i18n( "&Close All" ), this, TQT_SLOT( slotCloseAll() ) );
+    insertItem( SmallIcon( "window-close" ), i18n( "&Close All" ), this, TQ_SLOT( slotCloseAll() ) );
 }
 
 TQPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t)
@@ -219,17 +219,17 @@ TQPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t)
 
     id = menu->insertItem(SmallIconSet("go-up"),
                           i18n("Keep &Above Others"),
-                          t, TQT_SLOT(toggleAlwaysOnTop()));
+                          t, TQ_SLOT(toggleAlwaysOnTop()));
     menu->setItemChecked(id, t->isAlwaysOnTop());
 
     id = menu->insertItem(SmallIconSet("go-down"),
                           i18n("Keep &Below Others"),
-                          t, TQT_SLOT(toggleKeptBelowOthers()));
+                          t, TQ_SLOT(toggleKeptBelowOthers()));
     menu->setItemChecked(id, t->isKeptBelowOthers());
 
     id = menu->insertItem(SmallIconSet("view-fullscreen"),
                           i18n("&Fullscreen"),
-                          t, TQT_SLOT(toggleFullScreen()));
+                          t, TQ_SLOT(toggleFullScreen()));
     menu->setItemChecked(id, t->isFullScreen());
 
     if (KWin::allowedActionsSupported())
@@ -245,7 +245,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t)
 	TQPopupMenu* m = new TQPopupMenu( this );
 	m->setCheckable( true );
 
-	int id = m->insertItem( i18n("&All Desktops"), t, TQT_SLOT( toDesktop(int) ) );
+	int id = m->insertItem( i18n("&All Desktops"), t, TQ_SLOT( toDesktop(int) ) );
 	m->setItemParameter( id, 0 ); // 0 means all desktops
 	m->setItemChecked( id, t->isOnAllDesktops() );
 
@@ -253,7 +253,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t)
 
 	for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) {
 		TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&"));
-		id = m->insertItem( name, t, TQT_SLOT( toDesktop(int) ) );
+		id = m->insertItem( name, t, TQ_SLOT( toDesktop(int) ) );
 		m->setItemParameter( id, i );
 		m->setItemChecked( id, !t->isOnAllDesktops() && t->desktop() == i );
 	}
@@ -266,14 +266,14 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu()
 	TQPopupMenu* m = new TQPopupMenu( this );
 	m->setCheckable( true );
 
-	int id = m->insertItem( i18n("&All Desktops"), this, TQT_SLOT( slotAllToDesktop(int) ) );
+	int id = m->insertItem( i18n("&All Desktops"), this, TQ_SLOT( slotAllToDesktop(int) ) );
 	m->setItemParameter( id, 0 ); // 0 means all desktops
 
 	m->insertSeparator();
 
 	for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) {
 		TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&"));
-		id = m->insertItem( name, this, TQT_SLOT( slotAllToDesktop(int) ) );
+		id = m->insertItem( name, this, TQ_SLOT( slotAllToDesktop(int) ) );
 		m->setItemParameter( id, i );
 	}