Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

4 files changed, 34 insertions, 34 deletions

diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp
index a491aae27..c896c830a 100644
--- a/kicker/libkicker/kickertip.cpp
+++ b/kicker/libkicker/kickertip.cpp
@@ -80,9 +80,9 @@ KickerTip::KickerTip(TQWidget * parent)
     setBackgroundMode(NoBackground);
     resize(0, 0);
     hide();
-    connect(&m_frameTimer, TQT_SIGNAL(timeout()), TQT_SLOT(internalUpdate()));
+    connect(&m_frameTimer, TQ_SIGNAL(timeout()), TQ_SLOT(internalUpdate()));
 //     // FIXME: The settingsChanged(SettingsCategory) signal is not available under Trinity; where was it originally supposed to come from?
-//     connect(kapp, TQT_SIGNAL(settingsChanged(SettingsCategory)), TQT_SLOT(slotSettingsChanged()));
+//     connect(kapp, TQ_SIGNAL(settingsChanged(SettingsCategory)), TQ_SLOT(slotSettingsChanged()));
 }
 
 KickerTip::~KickerTip()
@@ -176,8 +176,8 @@ void KickerTip::display()
     // close the message window after given mS
     if (data.duration > 0)
     {
-        disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0);
-        connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(hide()));
+        disconnect(&m_timer, TQ_SIGNAL(timeout()), 0, 0);
+        connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(hide()));
         m_timer.start(data.duration, true);
     }
     else
@@ -424,16 +424,16 @@ void KickerTip::tipFor(const TQWidget* w)
 {
     if (m_tippingFor)
     {
-        disconnect(m_tippingFor, TQT_SIGNAL(destroyed(TQObject*)),
-                   this, TQT_SLOT(tipperDestroyed(TQObject*)));
+        disconnect(m_tippingFor, TQ_SIGNAL(destroyed(TQObject*)),
+                   this, TQ_SLOT(tipperDestroyed(TQObject*)));
     }
 
     m_tippingFor = w;
 
     if (m_tippingFor)
     {
-        connect(m_tippingFor, TQT_SIGNAL(destroyed(TQObject*)),
-                this, TQT_SLOT(tipperDestroyed(TQObject*)));
+        connect(m_tippingFor, TQ_SIGNAL(destroyed(TQObject*)),
+                this, TQ_SLOT(tipperDestroyed(TQObject*)));
     }
 }
 
@@ -526,8 +526,8 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event)
 
                 tipFor(widget);
                 m_timer.stop();
-                disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0);
-                connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(display()));
+                disconnect(&m_timer, TQ_SIGNAL(timeout()), 0, 0);
+                connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(display()));
 
                 // delay to avoid false starts
                 // e.g. when the user quickly zooms their mouse over
@@ -547,8 +547,8 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event)
 
             if (isTippingFor(widget) && isVisible())
             {
-                disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0);
-                connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(hide()));
+                disconnect(&m_timer, TQ_SIGNAL(timeout()), 0, 0);
+                connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(hide()));
                 m_timer.start(KickerSettings::mouseOversHideDelay(), true);
             }
 
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index aef83bbb3..0708d0b5f 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -93,8 +93,8 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard
 
     installEventFilter(KickerTip::the());
 
-    connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(updateSettings(int)));
-    connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(updateIcon(int)));
+    connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(updateSettings(int)));
+    connect(kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(updateIcon(int)));
 }
 
 void PanelButton::configure()
@@ -245,7 +245,7 @@ void PanelButton::checkForDeletion(const TQString& path)
     if (path == m_backingFile)
     {
         setEnabled(false);
-        TQTimer::singleShot(1000, this, TQT_SLOT(scheduleForRemoval()));
+        TQTimer::singleShot(1000, this, TQ_SLOT(scheduleForRemoval()));
     }
 }
 
@@ -278,7 +278,7 @@ void PanelButton::scheduleForRemoval()
         }
 
         timelapse *= 2;
-        TQTimer::singleShot(timelapse, this, TQT_SLOT(scheduleForRemoval()));
+        TQTimer::singleShot(timelapse, this, TQ_SLOT(scheduleForRemoval()));
     }
 }
 
@@ -833,16 +833,16 @@ void PanelButton::backedByFile(const TQString& localFilePath)
     }
 
     // avoid multiple connections
-    disconnect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)),
-               this, TQT_SLOT(checkForDeletion(const TQString&)));
+    disconnect(KDirWatch::self(), TQ_SIGNAL(deleted(const TQString&)),
+               this, TQ_SLOT(checkForDeletion(const TQString&)));
 
     if (!KDirWatch::self()->contains(m_backingFile))
     {
         KDirWatch::self()->addFile(m_backingFile);
     }
 
-    connect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)),
-            this, TQT_SLOT(checkForDeletion(const TQString&)));
+    connect(KDirWatch::self(), TQ_SIGNAL(deleted(const TQString&)),
+            this, TQ_SLOT(checkForDeletion(const TQString&)));
 
 }
 
@@ -966,7 +966,7 @@ PanelPopupButton::PanelPopupButton(TQWidget *parent, const char *name, bool forc
     m_pressedDuringPopup(false),
     m_initialized(false)
 {
-    connect(this, TQT_SIGNAL(pressed()), TQT_SLOT(slotExecMenu()));
+    connect(this, TQ_SIGNAL(pressed()), TQ_SLOT(slotExecMenu()));
 }
 
 void PanelPopupButton::setPopup(TQWidget *popup)
@@ -974,7 +974,7 @@ void PanelPopupButton::setPopup(TQWidget *popup)
     if (m_popup)
     {
         m_popup->removeEventFilter(this);
-        disconnect(m_popup, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(menuAboutToHide()));
+        disconnect(m_popup, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(menuAboutToHide()));
     }
 
     m_popup = popup;
@@ -983,7 +983,7 @@ void PanelPopupButton::setPopup(TQWidget *popup)
     if (m_popup)
     {
         m_popup->installEventFilter(this);
-        connect(m_popup, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(menuAboutToHide()));
+        connect(m_popup, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(menuAboutToHide()));
     }
 }
 
diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp
index a868747fb..0401cfcdc 100644
--- a/kicker/libkicker/panner.cpp
+++ b/kicker/libkicker/panner.cpp
@@ -46,7 +46,7 @@ Panner::Panner( TQWidget* parent, const char* name )
     setBackgroundOrigin( AncestorOrigin );
 
     _updateScrollButtonsTimer = new TQTimer(this);
-    connect(_updateScrollButtonsTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reallyUpdateScrollButtons()));
+    connect(_updateScrollButtonsTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(reallyUpdateScrollButtons()));
 
     _clipper = new TQWidget(this);
     _clipper->setBackgroundOrigin(AncestorOrigin);
@@ -78,8 +78,8 @@ void Panner::createScrollButtons()
     _luSB->setMinimumSize(12, 12);
     _luSB->hide();
     _layout->addWidget(_luSB);
-    connect(_luSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollLeftUp()));
-    connect(_luSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll()));
+    connect(_luSB, TQ_SIGNAL(pressed()), TQ_SLOT(startScrollLeftUp()));
+    connect(_luSB, TQ_SIGNAL(released()), TQ_SLOT(stopScroll()));
 
     // right/down scroll button
     _rdSB = new SimpleArrowButton(this);
@@ -88,8 +88,8 @@ void Panner::createScrollButtons()
     _rdSB->setMinimumSize(12, 12);
     _rdSB->hide();
     _layout->addWidget(_rdSB);
-    connect(_rdSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollRightDown()));
-    connect(_rdSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll()));
+    connect(_rdSB, TQ_SIGNAL(pressed()), TQ_SLOT(startScrollRightDown()));
+    connect(_rdSB, TQ_SIGNAL(released()), TQ_SLOT(stopScroll()));
 
     // set up the buttons
     setupButtons();
@@ -170,7 +170,7 @@ void Panner::scrollLeftUp()
 void Panner::startScrollRightDown()
 {
     _scrollTimer = new TQTimer(this);
-    connect(_scrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(scrollRightDown()));
+    connect(_scrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(scrollRightDown()));
     _scrollTimer->start(50);
     _step = 8;
     scrollRightDown();
@@ -179,7 +179,7 @@ void Panner::startScrollRightDown()
 void Panner::startScrollLeftUp()
 {
     _scrollTimer = new TQTimer(this);
-    connect(_scrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(scrollLeftUp()));
+    connect(_scrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(scrollLeftUp()));
     _scrollTimer->start(50);
     _step = 8;
     scrollLeftUp();
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp
index c53d6ce5a..79fd19915 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -47,10 +47,10 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name, bool forceStandar
 {
     setBackgroundOrigin( AncestorOrigin );
 
-    connect( kapp, TQT_SIGNAL( settingsChanged( int ) ),
-       TQT_SLOT( slotSettingsChanged( int ) ) );
-    connect( kapp, TQT_SIGNAL( iconChanged( int ) ),
-       TQT_SLOT( slotIconChanged( int ) ) );
+    connect( kapp, TQ_SIGNAL( settingsChanged( int ) ),
+       TQ_SLOT( slotSettingsChanged( int ) ) );
+    connect( kapp, TQ_SIGNAL( iconChanged( int ) ),
+       TQ_SLOT( slotIconChanged( int ) ) );
 
     kapp->addKipcEventMask( KIPC::SettingsChanged );
     kapp->addKipcEventMask( KIPC::IconChanged );