Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

9 files changed, 44 insertions, 44 deletions

diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp
index 4238fc562..089a8ac93 100644
--- a/kicker/menuext/kate/katesessionmenu.cpp
+++ b/kicker/menuext/kate/katesessionmenu.cpp
@@ -117,7 +117,7 @@ void KateSessionMenu::initialize()
 
   // means for updating, to let the user manually update if he/she added new sessions.
   insertSeparator();
-  insertItem( SmallIconSet("reload"), i18n("Reload Session List"), this, TQT_SLOT(reloadSessionsList()) );
+  insertItem( SmallIconSet("reload"), i18n("Reload Session List"), this, TQ_SLOT(reloadSessionsList()) );
 }
 
 void KateSessionMenu::slotExec( int id )
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index c9439c8db..2e196186f 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -150,8 +150,8 @@ void KonsoleMenu::initialize()
     insertItem(SmallIconSet("keditbookmarks"),
                i18n("New Session at Bookmark"), m_bookmarksSession);
     connect(m_bookmarkHandlerSession,
-            TQT_SIGNAL(openURL(const TQString&, const TQString&)),
-            TQT_SLOT(newSession(const TQString&, const TQString&)));
+            TQ_SIGNAL(openURL(const TQString&, const TQString&)),
+            TQ_SLOT(newSession(const TQString&, const TQString&)));
 
 
     screenList.clear();
@@ -229,11 +229,11 @@ void KonsoleMenu::initialize()
         // we don't have any profiles, disable the menu
         setItemEnabled(profileID, false);
     }
-    connect(m_profileMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(launchProfile(int)));
+    connect(m_profileMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(launchProfile(int)));
 
     insertSeparator();
     insertItem(SmallIconSet("reload"),
-               i18n("Reload Sessions"), this, TQT_SLOT(reinitialize()));
+               i18n("Reload Sessions"), this, TQ_SLOT(reinitialize()));
 }
 
 void KonsoleMenu::slotExec(int id)
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
index 9ace6483e..b2249d858 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
@@ -38,8 +38,8 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool )
     manager->setUpdate( true );
     manager->setShowNSBookmarks( false );
 
-    connect( manager, TQT_SIGNAL( changed(const TQString &, const TQString &) ),
-             TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) );
+    connect( manager, TQ_SIGNAL( changed(const TQString &, const TQString &) ),
+             TQ_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) );
     m_bookmarkMenu = new KonsoleBookmarkMenu( manager, this, m_menu,
                              NULL, false, /*Not toplevel*/
 			     false /*No 'Add Bookmark'*/ );
@@ -62,13 +62,13 @@ void KonsoleBookmarkHandler::importOldBookmarks( const TQString& path,
 
     KNSBookmarkImporter importer( path );
     connect( &importer,
-             TQT_SIGNAL( newBookmark( const TQString&, const TQCString&, const TQString& )),
-             TQT_SLOT( slotNewBookmark( const TQString&, const TQCString&, const TQString& )));
+             TQ_SIGNAL( newBookmark( const TQString&, const TQCString&, const TQString& )),
+             TQ_SLOT( slotNewBookmark( const TQString&, const TQCString&, const TQString& )));
     connect( &importer,
-             TQT_SIGNAL( newFolder( const TQString&, bool, const TQString& )),
-             TQT_SLOT( slotNewFolder( const TQString&, bool, const TQString& )));
-    connect( &importer, TQT_SIGNAL( newSeparator() ), TQT_SLOT( newSeparator() ));
-    connect( &importer, TQT_SIGNAL( endMenu() ), TQT_SLOT( endMenu() ));
+             TQ_SIGNAL( newFolder( const TQString&, bool, const TQString& )),
+             TQ_SLOT( slotNewFolder( const TQString&, bool, const TQString& )));
+    connect( &importer, TQ_SIGNAL( newSeparator() ), TQ_SLOT( newSeparator() ));
+    connect( &importer, TQ_SIGNAL( endMenu() ), TQ_SLOT( endMenu() ));
 
     importer.parseNSBookmarks( false );
 
diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
index 52588ed72..840b3b8f6 100644
--- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
@@ -31,14 +31,14 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr,
     /*
      * First, we disconnect KBookmarkMenu::slotAboutToShow()
      * Then,  we connect    KonsoleBookmarkMenu::slotAboutToShow().
-     * They are named differently because the TQT_SLOT() macro thinks we want
+     * They are named differently because the TQ_SLOT() macro thinks we want
      * KonsoleBookmarkMenu::KBookmarkMenu::slotAboutToShow()
      * Could this be solved if slotAboutToShow() is virtual in KBookmarMenu?
      */
-    disconnect( _parentMenu, TQT_SIGNAL( aboutToShow() ), this,
-                TQT_SLOT( slotAboutToShow() ) );
-    connect( _parentMenu, TQT_SIGNAL( aboutToShow() ),
-             TQT_SLOT( slotAboutToShow2() ) );
+    disconnect( _parentMenu, TQ_SIGNAL( aboutToShow() ), this,
+                TQ_SLOT( slotAboutToShow() ) );
+    connect( _parentMenu, TQ_SIGNAL( aboutToShow() ),
+             TQ_SLOT( slotAboutToShow2() ) );
 }
 
 /*
@@ -100,8 +100,8 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
                                          m_actionCollection, false,
 					 m_bAddBookmark, TQString::null );
       m_lstSubMenus.append(subMenu);
-      connect( actionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), subMenu,
-               TQT_SLOT(slotNSLoad()));
+      connect( actionMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), subMenu,
+               TQ_SLOT(slotNSLoad()));
     }
   }
 
@@ -128,7 +128,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
         // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl;
         // create a normal URL item, with ID as a name
         TDEAction * action = new TDEAction( text, bm.icon(), 0,
-                                        this, TQT_SLOT( slotBookmarkSelected() ),
+                                        this, TQ_SLOT( slotBookmarkSelected() ),
                                         m_actionCollection, bm.url().url().utf8() );
 
         action->setStatusText( bm.url().prettyURL() );
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index 2ab6afc2c..5440c1ed7 100644
--- a/kicker/menuext/prefmenu/prefmenu.cpp
+++ b/kicker/menuext/prefmenu/prefmenu.cpp
@@ -60,11 +60,11 @@ PrefMenu::PrefMenu(const TQString& label,
 {
     m_subMenus.setAutoDelete(true);
 
-    connect(KSycoca::self(),  TQT_SIGNAL(databaseChanged()),
-            this, TQT_SLOT(clearOnClose()));
+    connect(KSycoca::self(),  TQ_SIGNAL(databaseChanged()),
+            this, TQ_SLOT(clearOnClose()));
 
-    connect(this, TQT_SIGNAL(aboutToHide()),
-            this, TQT_SLOT(aboutToClose()));
+    connect(this, TQ_SIGNAL(aboutToHide()),
+            this, TQ_SLOT(aboutToClose()));
 }
 
 PrefMenu::~PrefMenu()
@@ -198,7 +198,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev)
     // If the path to the desktop file is relative, try to get the full
     // path from KStdDirs.
     KURLDrag *d = new KURLDrag(KURL::List(url), this);
-    connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(dragObjectDestroyed()));
+    connect(d, TQ_SIGNAL(destroyed()), this, TQ_SLOT(dragObjectDestroyed()));
     d->setPixmap(icon);
     d->dragCopy();
 
@@ -246,7 +246,7 @@ void PrefMenu::initialize()
     {
         insertItem(KickerLib::menuIconSet("kcontrol"),
                    i18n("Trinity Control Center"),
-                   this, TQT_SLOT(launchControlCenter()));
+                   this, TQ_SLOT(launchControlCenter()));
         insertSeparator();
     }
 
@@ -358,7 +358,7 @@ void PrefMenu::slotClear()
         // QPopupMenu's aboutToHide() is emitted before the popup is really hidden,
         // and also before a click in the menu is handled, so do the clearing
         // only after that has been handled
-        TQTimer::singleShot( 100, this, TQT_SLOT( slotClear()));
+        TQTimer::singleShot( 100, this, TQ_SLOT( slotClear()));
         return;
     }
 
diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp
index ae4137017..90c84ee32 100644
--- a/kicker/menuext/recentdocs/recentdocsmenu.cpp
+++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp
@@ -52,7 +52,7 @@ RecentDocsMenu::~RecentDocsMenu()
 void RecentDocsMenu::initialize() {
 	if (initialized()) clear();
 
-	insertItem(SmallIconSet("history_clear"), i18n("Clear History"), this, TQT_SLOT(slotClearHistory()));
+	insertItem(SmallIconSet("history_clear"), i18n("Clear History"), this, TQ_SLOT(slotClearHistory()));
 	insertSeparator();
 
 	_fileList = TDERecentDocument::recentDocuments();
diff --git a/kicker/menuext/remote/remotemenu.cpp b/kicker/menuext/remote/remotemenu.cpp
index aeaff8e94..8c0a8407a 100644
--- a/kicker/menuext/remote/remotemenu.cpp
+++ b/kicker/menuext/remote/remotemenu.cpp
@@ -68,9 +68,9 @@ void RemoteMenu::initialize()
     }
 
     id = insertItem(SmallIcon("wizard"), i18n("Add Network Folder"));
-    connectItem(id, this, TQT_SLOT(startWizard()));
+    connectItem(id, this, TQ_SLOT(startWizard()));
     id = insertItem(SmallIcon("kfm"), i18n("Manage Network Folders"));
-    connectItem(id, this, TQT_SLOT(openRemoteDir()));
+    connectItem(id, this, TQ_SLOT(openRemoteDir()));
 
     insertSeparator();
 
diff --git a/kicker/menuext/system/systemmenu.cpp b/kicker/menuext/system/systemmenu.cpp
index 12ec087d8..e738e7af9 100644
--- a/kicker/menuext/system/systemmenu.cpp
+++ b/kicker/menuext/system/systemmenu.cpp
@@ -32,8 +32,8 @@ SystemMenu::SystemMenu(TQWidget *parent, const char *name,
                        const TQStringList &/*args*/)
   : KPanelMenu( parent, name)
 {
-    connect( &m_dirLister, TQT_SIGNAL( completed() ),
-             this, TQT_SLOT( slotCompleted() ) );
+    connect( &m_dirLister, TQ_SIGNAL( completed() ),
+             this, TQ_SLOT( slotCompleted() ) );
 
     m_dirLister.openURL(KURL("system:/"));
 }
diff --git a/kicker/menuext/tom/tom.cpp b/kicker/menuext/tom/tom.cpp
index ed07468de..973c52ee9 100644
--- a/kicker/menuext/tom/tom.cpp
+++ b/kicker/menuext/tom/tom.cpp
@@ -217,7 +217,7 @@ void TOM::initializeRecentDocs()
 {
     m_recentDocsMenu->clear();
     m_recentDocsMenu->insertItem(SmallIconSet("history_clear"), i18n("Clear History"),
-                                 this, TQT_SLOT(clearRecentDocHistory()));
+                                 this, TQ_SLOT(clearRecentDocHistory()));
     m_recentDocsMenu->insertSeparator();
 
     m_recentDocURLs = TDERecentDocument::recentDocuments();
@@ -365,13 +365,13 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu)
         return 0;
     }
 
-    connect(taskGroup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(runTask(int)));
+    connect(taskGroup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(runTask(int)));
     // so we have an actual task group menu with tasks, let's add it
 
     if (inSubMenu)
     {
-        TQObject::connect(taskGroup, TQT_SIGNAL(aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*)),
-                         this, TQT_SLOT(contextualizeRMBmenu(TDEPopupMenu*, int, TQPopupMenu*)));
+        TQObject::connect(taskGroup, TQ_SIGNAL(aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*)),
+                         this, TQ_SLOT(contextualizeRMBmenu(TDEPopupMenu*, int, TQPopupMenu*)));
 
         m_submenus.append(taskGroup);
 
@@ -389,7 +389,7 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu)
             rmbMenu->insertItem(title, contextMenuTitleID);
             rmbMenu->insertItem(i18n("Add This Task to Panel"));
             rmbMenu->insertItem(i18n("Modify This Task..."));
-            rmbMenu->insertItem(i18n("Remove This Task..."), this, TQT_SLOT(removeTask()));
+            rmbMenu->insertItem(i18n("Remove This Task..."), this, TQ_SLOT(removeTask()));
             rmbMenu->insertItem(i18n("Insert New Task..."));
         }
     }
@@ -432,7 +432,7 @@ void TOM::initialize()
     }
     else
     {
-      connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
+      connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged()));
     }*/
 
     // TASKS
@@ -486,7 +486,7 @@ void TOM::initialize()
     }
     else if (kapp->authorize("run_command"))
     {
-        insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand()));
+        insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQ_SLOT(runCommand()));
     }
 
     // RECENTLY USED ITEMS
@@ -494,8 +494,8 @@ void TOM::initialize()
 
     m_recentDocsMenu = new TDEPopupMenu(this, "recentDocs");
     m_recentDocsMenu->setFont(m_largerFont);
-    connect(m_recentDocsMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(initializeRecentDocs()));
-    connect(m_recentDocsMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(openRecentDocument(int)));
+    connect(m_recentDocsMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(initializeRecentDocs()));
+    connect(m_recentDocsMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(openRecentDocument(int)));
     insertItem(DesktopIcon("text-x-generic", TDEIcon::SizeMedium), i18n("Recent Documents"), m_recentDocsMenu);
     m_submenus.append(m_recentDocsMenu);
 
@@ -512,7 +512,7 @@ void TOM::initialize()
     // if we have no destinations, put the run command here
     if (numDests == 0 && kapp->authorize("run_command"))
     {
-        insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand()));
+        insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQ_SLOT(runCommand()));
     }
 
 
@@ -564,7 +564,7 @@ void TOM::initialize()
     }
 
     insertItem(DesktopIcon("system-log-out", TDEIcon::SizeMedium),
-               i18n("Logout %1").arg(username), this, TQT_SLOT(logout()));
+               i18n("Logout %1").arg(username), this, TQ_SLOT(logout()));
 }
 
 void TOM::reload()