diff options
Diffstat (limited to 'kicker/kicker/core/container_button.cpp')
| -rw-r--r-- | kicker/kicker/core/container_button.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp index 40f479308..d3a550a07 100644 --- a/kicker/kicker/core/container_button.cpp +++ b/kicker/kicker/core/container_button.cpp @@ -161,13 +161,13 @@ void ButtonContainer::embedButton(PanelButton* b) } _layout = vbox; - connect(_button, TQT_SIGNAL(requestSave()), TQT_SIGNAL(requestSave())); - connect(_button, TQT_SIGNAL(hideme(bool)), TQT_SLOT(hideRequested(bool))); - connect(_button, TQT_SIGNAL(removeme()), TQT_SLOT(removeRequested())); - connect(_button, TQT_SIGNAL(dragme(const TQPixmap)), - TQT_SLOT(dragButton(const TQPixmap))); - connect(_button, TQT_SIGNAL(dragme(const KURL::List, const TQPixmap)), - TQT_SLOT(dragButton(const KURL::List, const TQPixmap))); + connect(_button, TQ_SIGNAL(requestSave()), TQ_SIGNAL(requestSave())); + connect(_button, TQ_SIGNAL(hideme(bool)), TQ_SLOT(hideRequested(bool))); + connect(_button, TQ_SIGNAL(removeme()), TQ_SLOT(removeRequested())); + connect(_button, TQ_SIGNAL(dragme(const TQPixmap)), + TQ_SLOT(dragButton(const TQPixmap))); + connect(_button, TQ_SIGNAL(dragme(const KURL::List, const TQPixmap)), + TQ_SLOT(dragButton(const KURL::List, const TQPixmap))); } TQPopupMenu* ButtonContainer::createOpMenu() @@ -225,7 +225,7 @@ void ButtonContainer::dragButton(const TQPixmap icon) bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_button) && e->type() == TQEvent::MouseButtonPress) + if (o == _button && e->type() == TQEvent::MouseButtonPress) { static bool sentinal = false; @@ -235,10 +235,10 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) } sentinal = true; - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); switch (me->button()) { - case Qt::MidButton: + case TQt::MidButton: { if (isImmutable()) { @@ -252,7 +252,7 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) return true; } - case Qt::RightButton: + case TQt::RightButton: { if (!kapp->authorizeTDEAction("kicker_rmb") || isImmutable()) @@ -261,9 +261,9 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) } TQPopupMenu* menu = opMenu(); - connect( menu, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotMenuClosed() ) ); - TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(this), - (orientation() == Qt::Horizontal) ? + connect( menu, TQ_SIGNAL( aboutToHide() ), this, TQ_SLOT( slotMenuClosed() ) ); + TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, this, + (orientation() == TQt::Horizontal) ? TQPoint(0, 0) : me->pos()); Kicker::the()->setInsertionPoint(me->globalPos()); |