diff options
Diffstat (limited to 'kicker/libkicker/simplebutton.cpp')
| -rw-r--r-- | kicker/libkicker/simplebutton.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp index c53d6ce5a..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" @@ -47,13 +47,13 @@ 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( 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 ); } @@ -95,7 +95,7 @@ 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; @@ -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) { |