Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

4 files changed, 30 insertions, 30 deletions

diff --git a/kicker/applets/launcher/configdlg.cpp b/kicker/applets/launcher/configdlg.cpp
index d542d2593..88301b7cf 100644
--- a/kicker/applets/launcher/configdlg.cpp
+++ b/kicker/applets/launcher/configdlg.cpp
@@ -47,8 +47,8 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, Prefs *config,
         m_ui->iconDim->insertItem(TQString::number(
             m_settings->iconDimChoices()[n]));
     }
-    connect(m_ui->iconDim, TQT_SIGNAL(textChanged(const TQString&)),
-            this, TQT_SLOT(updateButtons()));
+    connect(m_ui->iconDim, TQ_SIGNAL(textChanged(const TQString&)),
+            this, TQ_SLOT(updateButtons()));
     updateWidgets();
     m_oldIconDimText = m_ui->iconDim->currentText();
     updateButtons();
diff --git a/kicker/applets/launcher/quickaddappsmenu.cpp b/kicker/applets/launcher/quickaddappsmenu.cpp
index cdbc94dd5..bf496e028 100644
--- a/kicker/applets/launcher/quickaddappsmenu.cpp
+++ b/kicker/applets/launcher/quickaddappsmenu.cpp
@@ -38,8 +38,8 @@ QuickAddAppsMenu::QuickAddAppsMenu(const TQString &label, const TQString &relPat
 {
    _targetObject = target;
    _sender = sender;
-   connect(this, TQT_SIGNAL(addAppBefore(TQString,TQString)), 
-           target, TQT_SLOT(addAppBeforeManually(TQString,TQString)));
+   connect(this, TQ_SIGNAL(addAppBefore(TQString,TQString)), 
+           target, TQ_SLOT(addAppBeforeManually(TQString,TQString)));
 }
 
 QuickAddAppsMenu::QuickAddAppsMenu(TQWidget *target, TQWidget *parent, const TQString &sender, const char *name)
@@ -47,8 +47,8 @@ QuickAddAppsMenu::QuickAddAppsMenu(TQWidget *target, TQWidget *parent, const TQS
 {
    _targetObject = target;
    _sender = sender;
-   connect(this, TQT_SIGNAL(addAppBefore(TQString,TQString)),
-           target, TQT_SLOT(addAppBeforeManually(TQString,TQString)));
+   connect(this, TQ_SIGNAL(addAppBefore(TQString,TQString)),
+           target, TQ_SLOT(addAppBeforeManually(TQString,TQString)));
 }
 
 void QuickAddAppsMenu::slotExec(int id)
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index add317a3b..2b09dac34 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -158,7 +158,7 @@ QuickButton::QuickButton(const TQString &u, TDEAction* configAction,
     if (_qurl->url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {
         setToggleButton(true);
         setOn( ShowDesktop::the()->desktopShowing() );
-        connect( ShowDesktop::the(), TQT_SIGNAL(desktopShown(bool)), this, TQT_SLOT(toggle(bool)) );
+        connect( ShowDesktop::the(), TQ_SIGNAL(desktopShown(bool)), this, TQ_SLOT(toggle(bool)) );
     }
 
     TQToolTip::add(this, _qurl->name());
@@ -172,18 +172,18 @@ QuickButton::QuickButton(const TQString &u, TDEAction* configAction,
     configAction->plug(_popup);
         _popup->insertSeparator();
     _popup->insertItem(SmallIcon("remove"), i18n("Remove Application"), 
-            this, TQT_SLOT(removeApp()));
+            this, TQ_SLOT(removeApp()));
 
     m_stickyAction = new TDEToggleAction(i18n("Never Remove Automatically"),
         TDEShortcut(), this);
-    connect(m_stickyAction, TQT_SIGNAL(toggled(bool)), 
-        this, TQT_SLOT(slotStickyToggled(bool)));
+    connect(m_stickyAction, TQ_SIGNAL(toggled(bool)), 
+        this, TQ_SLOT(slotStickyToggled(bool)));
     m_stickyAction->plug(_popup, 2);
     m_stickyId = _popup->idAt(2);
 
-    connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(launch()));
-    connect(this, TQT_SIGNAL(removeApp(QuickButton *)), parent,
-        TQT_SLOT(removeAppManually(QuickButton *)));
+    connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(launch()));
+    connect(this, TQ_SIGNAL(removeApp(QuickButton *)), parent,
+        TQ_SLOT(removeAppManually(QuickButton *)));
 }
 
 QuickButton::~QuickButton()
@@ -303,7 +303,7 @@ void QuickButton::removeApp()
 void QuickButton::flash()
 {
    m_flashCounter = 2000;
-   TQTimer::singleShot(0, this, TQT_SLOT(slotFlash()));
+   TQTimer::singleShot(0, this, TQ_SLOT(slotFlash()));
 }
 
 void QuickButton::slotFlash()
@@ -314,7 +314,7 @@ void QuickButton::slotFlash()
         m_flashCounter -= timeout;
         if (m_flashCounter < 0) m_flashCounter = 0;
         update();
-        TQTimer::singleShot(timeout, this, TQT_SLOT(slotFlash()));
+        TQTimer::singleShot(timeout, this, TQ_SLOT(slotFlash()));
     }
 }
 
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index d0f5d25dd..3f0ee88a8 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -108,10 +108,10 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
     m_dragButtons = 0;
 
     m_configAction = new TDEAction(i18n("Configure Quicklauncher..."), "configure", TDEShortcut(),
-        this, TQT_SLOT(slotConfigure()), this);
+        this, TQ_SLOT(slotConfigure()), this);
 
     m_saveTimer = new TQTimer(this, "m_saveTimer");
-    connect(m_saveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(saveConfig()));
+    connect(m_saveTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(saveConfig()));
 
     m_popularity = new PopularityStatistics();
 
@@ -168,15 +168,15 @@ void QuickLauncher::buildPopupMenu()
     m_appletPopup = new TQPopupMenu(this);
     m_appletPopup->insertItem(i18n("Add Application"), addAppsMenu);
     m_removeAppsMenu = new TQPopupMenu(this);
-    connect(m_removeAppsMenu, TQT_SIGNAL(aboutToShow()),
-            TQT_SLOT(fillRemoveAppsMenu()));
-    connect(m_removeAppsMenu, TQT_SIGNAL(activated(int)), 
-            TQT_SLOT(removeAppManually(int)));
+    connect(m_removeAppsMenu, TQ_SIGNAL(aboutToShow()),
+            TQ_SLOT(fillRemoveAppsMenu()));
+    connect(m_removeAppsMenu, TQ_SIGNAL(activated(int)), 
+            TQ_SLOT(removeAppManually(int)));
     m_appletPopup->insertItem(i18n("Remove Application"), m_removeAppsMenu);
 
     m_appletPopup->insertSeparator();
     m_appletPopup->setCheckable( true );
-    m_appletPopup->insertItem(i18n("About"), this, TQT_SLOT(about()));
+    m_appletPopup->insertItem(i18n("About"), this, TQ_SLOT(about()));
     setCustomMenu(m_appletPopup);
 }
 
@@ -235,8 +235,8 @@ void QuickLauncher::slotConfigure()
         m_configDialog = new ConfigDlg(this, "configdialog", 
             m_settings, SIZE_AUTO, KDialogBase::Plain, KDialogBase::Ok | 
             KDialogBase::Cancel | KDialogBase::Apply | KDialogBase::Default);
-        connect(m_configDialog, TQT_SIGNAL(settingsChanged()),
-            this, TQT_SLOT(slotSettingsDialogChanged()));
+        connect(m_configDialog, TQ_SIGNAL(settingsChanged()),
+            this, TQ_SLOT(slotSettingsDialogChanged()));
     }
 
     m_configDialog->show();
@@ -392,10 +392,10 @@ void QuickLauncher::addApp(TQString url, bool manuallyAdded)
 QuickButton* QuickLauncher::createButton(TQString url)
 {
     QuickButton* newButton=new QuickButton(url, m_configAction, this);
-    connect(newButton, TQT_SIGNAL(executed(TQString)), 
-            this, TQT_SLOT(slotOwnServiceExecuted(TQString)));
-    connect(newButton, TQT_SIGNAL(stickyToggled(bool)), 
-            this, TQT_SLOT(slotStickyToggled()));
+    connect(newButton, TQ_SIGNAL(executed(TQString)), 
+            this, TQ_SLOT(slotOwnServiceExecuted(TQString)));
+    connect(newButton, TQ_SIGNAL(stickyToggled(bool)), 
+            this, TQ_SLOT(slotStickyToggled()));
     newButton->setPopupDirection(popupDirection());
     return newButton;
 }
@@ -973,7 +973,7 @@ void QuickLauncher::serviceStartedByStorageId(TQString /*starter*/, TQString sto
 
     if (m_settings->autoAdjustEnabled())
     {
-        TQTimer::singleShot(0, this, TQT_SLOT(slotAdjustToCurrentPopularity()));
+        TQTimer::singleShot(0, this, TQ_SLOT(slotAdjustToCurrentPopularity()));
     }
 }
 
@@ -1047,7 +1047,7 @@ void QuickLauncher::slotOwnServiceExecuted(TQString serviceMenuId)
     m_popularity->useService(serviceMenuId);
     if (m_settings->autoAdjustEnabled())
     {
-        TQTimer::singleShot(0, this, TQT_SLOT(slotAdjustToCurrentPopularity()));
+        TQTimer::singleShot(0, this, TQ_SLOT(slotAdjustToCurrentPopularity()));
     }
 }