1 files changed, 23 insertions, 23 deletions

diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp
index 12d5085d4..6836e06eb 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -30,7 +30,7 @@
 #include <kiconeffect.h>
 #include <kicontheme.h>
 #include <kipc.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "kickerSettings.h"
 
@@ -42,18 +42,18 @@
 SimpleButton::SimpleButton(TQWidget *parent, const char *name, bool forceStandardCursor)
     : TQButton(parent, name),
       m_highlight(false),
-      m_orientation(Qt::Horizontal),
+      m_orientation(TQt::Horizontal),
       m_forceStandardCursor(forceStandardCursor)
 {
     setBackgroundOrigin( AncestorOrigin );
 
-    connect( kapp, TQT_SIGNAL( settingsChanged( int ) ),
-       TQT_SLOT( slotSettingsChanged( int ) ) );
-    connect( kapp, TQT_SIGNAL( iconChanged( int ) ),
-       TQT_SLOT( slotIconChanged( int ) ) );
+    connect( tdeApp, TQ_SIGNAL( settingsChanged( int ) ),
+       TQ_SLOT( slotSettingsChanged( int ) ) );
+    connect( tdeApp, TQ_SIGNAL( iconChanged( int ) ),
+       TQ_SLOT( slotIconChanged( int ) ) );
 
-    kapp->addKipcEventMask( KIPC::SettingsChanged );
-    kapp->addKipcEventMask( KIPC::IconChanged );
+    tdeApp->addKipcEventMask( KIPC::SettingsChanged );
+    tdeApp->addKipcEventMask( KIPC::IconChanged );
 
     slotSettingsChanged( TDEApplication::SETTINGS_MOUSE );
 }
@@ -65,7 +65,7 @@ void SimpleButton::setPixmap(const TQPixmap &pix)
     update();
 }
 
-void SimpleButton::setOrientation(Qt::Orientation orientation)
+void SimpleButton::setOrientation(TQt::Orientation orientation)
 {
     m_orientation = orientation;
     update();
@@ -95,11 +95,11 @@ void SimpleButton::drawButton( TQPainter *p )
 {
     TQRect r(0, 0, width(), height());
 
-    if (m_disableHighlighting == TRUE) {
+    if (m_disableHighlighting) {
         if (m_highlight || isDown() || isOn()) {
             int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
             if (isDown() || isOn()) flags |= TQStyle::Style_Down;
-            style().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, r, colorGroup(), flags);
+            style().drawPrimitive(TQStyle::PE_ButtonTool, p, r, colorGroup(), flags);
         }
     }
 
@@ -115,13 +115,13 @@ void SimpleButton::drawButtonLabel( TQPainter *p )
 
     TQPixmap pix = isEnabled() ? ((m_highlight&&(!m_disableHighlighting))? m_activeIcon : m_normalIcon) : m_disabledIcon;
 
-    if ((isOn() || isDown()) && (m_disableHighlighting == FALSE))
+    if ((isOn() || isDown()) && !m_disableHighlighting)
     {
         pix = TQImage(pix.convertToImage()).smoothScale(pix.width() - 2,
                                                pix.height() - 2);
     }
 
-    if (m_disableHighlighting == TRUE) {
+    if (m_disableHighlighting) {
         pix = TQImage(pix.convertToImage()).smoothScale(pix.width() - 4,
                                                pix.height() - 4);
     }
@@ -171,10 +171,10 @@ void SimpleButton::slotSettingsChanged(int category)
     }
 
     bool changeCursor;
-    if (m_forceStandardCursor == FALSE)
+    if (!m_forceStandardCursor)
         changeCursor = TDEGlobalSettings::changeCursorOverIcon();
     else
-        changeCursor = FALSE;
+        changeCursor = false;
 
     if (changeCursor)
     {
@@ -220,7 +220,7 @@ void SimpleButton::resizeEvent( TQResizeEvent * )
 }
 
 
-SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, const char *name, bool forceStandardCursor)
+SimpleArrowButton::SimpleArrowButton(TQWidget *parent, TQt::ArrowType arrow, const char *name, bool forceStandardCursor)
     : SimpleButton(parent, name, forceStandardCursor),
       m_forceStandardCursor(forceStandardCursor)
 {
@@ -234,7 +234,7 @@ TQSize SimpleArrowButton::sizeHint() const
     return TQSize( 12, 12 );
 }
 
-void SimpleArrowButton::setArrowType(Qt::ArrowType a)
+void SimpleArrowButton::setArrowType(TQt::ArrowType a)
 {
     if (_arrow != a) 
     {
@@ -243,7 +243,7 @@ void SimpleArrowButton::setArrowType(Qt::ArrowType a)
     }
 }
 
-Qt::ArrowType SimpleArrowButton::arrowType() const
+TQt::ArrowType SimpleArrowButton::arrowType() const
 {
     return _arrow;
 }
@@ -255,15 +255,15 @@ void SimpleArrowButton::drawButton( TQPainter *p )
     TQStyle::PrimitiveElement pe = TQStyle::PE_ArrowLeft;
     switch (_arrow)
     {
-        case Qt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break;
-        case Qt::RightArrow: pe = TQStyle::PE_ArrowRight; break;
-        case Qt::UpArrow: pe = TQStyle::PE_ArrowUp; break;
-        case Qt::DownArrow: pe = TQStyle::PE_ArrowDown; break;
+        case TQt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break;
+        case TQt::RightArrow: pe = TQStyle::PE_ArrowRight; break;
+        case TQt::UpArrow: pe = TQStyle::PE_ArrowUp; break;
+        case TQt::DownArrow: pe = TQStyle::PE_ArrowDown; break;
     }
 
     int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
     if (isDown() || isOn())	flags |= TQStyle::Style_Down;
-    style().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
+    style().drawPrimitive(pe, p, r, colorGroup(), flags);
 
     if (m_forceStandardCursor) {
         SimpleButton::drawButton(p);