diff options
Diffstat (limited to 'kicker/kicker/core/applethandle.cpp')
| -rw-r--r-- | kicker/kicker/core/applethandle.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp index 1806fedbb..c8f87b02e 100644 --- a/kicker/kicker/core/applethandle.cpp +++ b/kicker/kicker/core/applethandle.cpp @@ -64,8 +64,8 @@ AppletHandle::AppletHandle(AppletContainer* parent) m_menuButton->installEventFilter(this); m_layout->addWidget(m_menuButton); - connect(m_menuButton, TQT_SIGNAL(pressed()), - this, TQT_SLOT(menuButtonPressed())); + connect(m_menuButton, TQ_SIGNAL(pressed()), + this, TQ_SLOT(menuButtonPressed())); TQToolTip::add(m_menuButton, i18n("%1 menu").arg(parent->info().name())); } @@ -89,7 +89,7 @@ int AppletHandle::widthForHeight( int /* h */ ) const void AppletHandle::setPopupDirection(KPanelApplet::Direction d) { - Qt::ArrowType a = Qt::UpArrow; + TQt::ArrowType a = TQt::UpArrow; if (d == m_popupDirection || !m_menuButton) { @@ -102,19 +102,19 @@ void AppletHandle::setPopupDirection(KPanelApplet::Direction d) { case KPanelApplet::Up: m_layout->setDirection(TQBoxLayout::BottomToTop); - a = Qt::UpArrow; + a = TQt::UpArrow; break; case KPanelApplet::Down: m_layout->setDirection(TQBoxLayout::TopToBottom); - a = Qt::DownArrow; + a = TQt::DownArrow; break; case KPanelApplet::Left: m_layout->setDirection(TQBoxLayout::RightToLeft); - a = Qt::LeftArrow; + a = TQt::LeftArrow; break; case KPanelApplet::Right: m_layout->setDirection(TQBoxLayout::LeftToRight); - a = Qt::RightArrow; + a = TQt::RightArrow; break; } @@ -151,8 +151,8 @@ void AppletHandle::setFadeOutHandle(bool fadeOut) if (!m_handleHoverTimer) { m_handleHoverTimer = new TQTimer(this, "m_handleHoverTimer"); - connect(m_handleHoverTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(checkHandleHover())); + connect(m_handleHoverTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(checkHandleHover())); m_applet->installEventFilter(this); } } @@ -200,7 +200,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) // a hack for applets that have out-of-process // elements (e.g the systray) so that the handle // doesn't flicker when moving over those elements - if (TQT_TQRECT_OBJECT(w->rect()).contains(w->mapFromGlobal(TQCursor::pos()))) + if (w->rect().contains(w->mapFromGlobal(TQCursor::pos()))) { nowDrawIt = true; } @@ -220,12 +220,12 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) return TQWidget::eventFilter( o, e ); } - else if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_dragBar)) + else if (o == m_dragBar) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* ev = TQT_TQMOUSEEVENT(e); - if (ev->button() == Qt::LeftButton || ev->button() == Qt::MidButton) + TQMouseEvent* ev = static_cast<TQMouseEvent*>(e); + if (ev->button() == TQt::LeftButton || ev->button() == TQt::MidButton) { emit moveApplet(m_applet->mapFromGlobal(ev->globalPos())); } @@ -234,8 +234,8 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) if (m_menuButton && e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* ev = TQT_TQMOUSEEVENT(e); - if (ev->button() == Qt::RightButton) + TQMouseEvent* ev = static_cast<TQMouseEvent*>(e); + if (ev->button() == TQt::RightButton) { if (!m_menuButton->isDown()) { @@ -312,7 +312,7 @@ TQSize AppletHandleDrag::minimumSizeHint() const { int wh = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); - if (m_parent->orientation() == Qt::Horizontal) + if (m_parent->orientation() == TQt::Horizontal) { return TQSize(wh, 0); } @@ -322,7 +322,7 @@ TQSize AppletHandleDrag::minimumSizeHint() const TQSizePolicy AppletHandleDrag::sizePolicy() const { - if (m_parent->orientation() == Qt::Horizontal) + if (m_parent->orientation() == TQt::Horizontal) { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred ); } @@ -360,14 +360,14 @@ void AppletHandleDrag::paintEvent(TQPaintEvent *) TQStyle::SFlags flags = TQStyle::Style_Default; flags |= TQStyle::Style_Enabled; - if (m_parent->orientation() == Qt::Horizontal) + if (m_parent->orientation() == TQt::Horizontal) { flags |= TQStyle::Style_Horizontal; } TQRect r = rect(); - style().tqdrawPrimitive(TQStyle::PE_DockWindowHandle, &p, r, + style().drawPrimitive(TQStyle::PE_DockWindowHandle, &p, r, colorGroup(), flags); } else @@ -387,7 +387,7 @@ TQSize AppletHandleButton::minimumSizeHint() const int height = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); int width = height; - if (m_parent->orientation() == Qt::Horizontal) + if (m_parent->orientation() == TQt::Horizontal) { return TQSize(width, height); } |