diff options
Diffstat (limited to 'kicker/libkicker')
| -rw-r--r-- | kicker/libkicker/global.cpp | 2 | ||||
| -rw-r--r-- | kicker/libkicker/panelbutton.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp index 67f280106..3265c428c 100644 --- a/kicker/libkicker/global.cpp +++ b/kicker/libkicker/global.cpp @@ -207,7 +207,7 @@ TQPopupMenu* reduceMenu(TQPopupMenu *menu) return menu; } - TQMenuItem *item = menu->tqfindItem(menu->idAt(0)); + TQMenuItem *item = menu->findItem(menu->idAt(0)); if (item->popup()) { diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index f5e35a2ad..4d60068a8 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -978,7 +978,7 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) if (e->type() == TQEvent::MouseMove) { TQMouseEvent *me = TQT_TQMOUSEEVENT(e); - if (TQT_TQRECT_OBJECT(rect()).tqcontains(mapFromGlobal(me->globalPos())) && + if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos())) && ((me->state() & ControlButton) != 0 || (me->state() & ShiftButton) != 0)) { @@ -990,7 +990,7 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) e->type() == TQEvent::MouseButtonDblClick) { TQMouseEvent *me = TQT_TQMOUSEEVENT(e); - if (TQT_TQRECT_OBJECT(rect()).tqcontains(mapFromGlobal(me->globalPos()))) + if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos()))) { m_pressedDuringPopup = true; return true; @@ -999,7 +999,7 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) else if (e->type() == TQEvent::MouseButtonRelease) { TQMouseEvent *me = TQT_TQMOUSEEVENT(e); - if (TQT_TQRECT_OBJECT(rect()).tqcontains(mapFromGlobal(me->globalPos()))) + if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos()))) { if (m_pressedDuringPopup && m_popup) { |