1 files changed, 20 insertions, 20 deletions

diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index aef83bbb3..42e5286e2 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -43,7 +43,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kicontheme.h>
 #include <kiconeffect.h>
 #include <kipc.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 
@@ -89,12 +89,12 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard
 
     updateSettings(TDEApplication::SETTINGS_MOUSE);
 
-    kapp->addKipcEventMask(KIPC::SettingsChanged | KIPC::IconChanged);
+    tdeApp->addKipcEventMask(KIPC::SettingsChanged | KIPC::IconChanged);
 
     installEventFilter(KickerTip::the());
 
-    connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(updateSettings(int)));
-    connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(updateIcon(int)));
+    connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(updateSettings(int)));
+    connect(tdeApp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(updateIcon(int)));
 }
 
 void PanelButton::configure()
@@ -225,10 +225,10 @@ void PanelButton::updateSettings(int category)
         return;
     }
 
-    if (m_forceStandardCursor == FALSE)
+    if (!m_forceStandardCursor)
         m_changeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon();
     else
-        m_changeCursorOverItem = FALSE;
+        m_changeCursorOverItem = false;
 
     if (m_changeCursorOverItem)
     {
@@ -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()));
     }
 }
 
@@ -436,7 +436,7 @@ void PanelButton::startDrag()
 
 void PanelButton::enterEvent(TQEvent* e)
 {
-    if (!m_highlight && m_disableHighlighting == FALSE)
+    if (!m_highlight && !m_disableHighlighting)
     {
         m_highlight = true;
         repaint(false);
@@ -602,7 +602,7 @@ void PanelButton::drawDeepButton(TQPainter *p)
         style().drawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised);
     }
 
-    drawButtonLabel(p,0,FALSE);
+    drawButtonLabel(p,0,false);
 
     if (hasFocus() || m_hasAcceptedDrag)
     {
@@ -616,7 +616,7 @@ void PanelButton::drawDeepButton(TQPainter *p)
 
 void PanelButton::drawButtonLabel(TQPainter *p)
 {
-    drawButtonLabel(p,0,TRUE);
+    drawButtonLabel(p,0,true);
 }
 
 void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow)
@@ -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()));
     }
 }
 
@@ -1057,8 +1057,8 @@ void PanelPopupButton::slotExecMenu()
 
     m_pressedDuringPopup = false;
     KickerTip::enableTipping(false);
-    kapp->syncX();
-    kapp->processEvents();
+    tdeApp->syncX();
+    tdeApp->processEvents();
 
     if (!m_initialized)
     {