diff options
Diffstat (limited to 'kicker/libkicker/panelbutton.cpp')
| -rw-r--r-- | kicker/libkicker/panelbutton.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index 0708d0b5f..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, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(updateSettings(int))); - connect(kapp, TQ_SIGNAL(iconChanged(int)), TQ_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) { @@ -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) @@ -1057,8 +1057,8 @@ void PanelPopupButton::slotExecMenu() m_pressedDuringPopup = false; KickerTip::enableTipping(false); - kapp->syncX(); - kapp->processEvents(); + tdeApp->syncX(); + tdeApp->processEvents(); if (!m_initialized) { |