1 files changed, 21 insertions, 21 deletions

diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp
index 0a6000f37..c896c830a 100644
--- a/kicker/libkicker/kickertip.cpp
+++ b/kicker/libkicker/kickertip.cpp
@@ -76,13 +76,13 @@ KickerTip::KickerTip(TQWidget * parent)
       m_timer(0, "KickerTip::m_timer"),
       m_frameTimer(0, "KickerTip::m_frameTimer")
 {
-    setFocusPolicy(TQ_NoFocus);
+    setFocusPolicy(TQWidget::NoFocus);
     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
@@ -283,10 +283,10 @@ void KickerTip::plainMask()
 {
     TQPainter maskPainter(&m_mask);
 
-    m_mask.fill(Qt::color0);
+    m_mask.fill(TQt::color0);
 
-    maskPainter.setBrush(Qt::color1);
-    maskPainter.setPen(Qt::NoPen);
+    maskPainter.setBrush(TQt::color1);
+    maskPainter.setPen(TQt::NoPen);
     //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height());
     drawRoundRect(maskPainter, m_mask.rect());
     setMask(m_mask);
@@ -297,10 +297,10 @@ void KickerTip::dissolveMask()
 {
     TQPainter maskPainter(&m_mask);
 
-    m_mask.fill(Qt::color0);
+    m_mask.fill(TQt::color0);
 
-    maskPainter.setBrush(Qt::color1);
-    maskPainter.setPen(Qt::NoPen);
+    maskPainter.setBrush(TQt::color1);
+    maskPainter.setPen(TQt::NoPen);
     //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height());
     drawRoundRect(maskPainter, m_mask.rect());
 
@@ -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*)));
     }
 }
 
@@ -452,7 +452,7 @@ void KickerTip::tipperDestroyed(TQObject* o)
 {
     // we can't do a dynamic cast because we are in the process of dying
     // so static it is.
-    untipFor(TQT_TQWIDGET(o));
+    untipFor(static_cast<TQWidget*>(o));
 }
 
 void KickerTip::internalUpdate()
@@ -508,7 +508,7 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event)
         return false;
     }
 
-    TQWidget *widget = TQT_TQWIDGET(object);
+    TQWidget *widget = static_cast<TQWidget*>(object);
 
     switch (event->type())
     {
@@ -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);
             }