From 7bc43c68b3c095631628e1fb691242315687d15b Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 8 Aug 2023 12:20:43 +0900 Subject: Drop TQT_TQ*_OBJECT defines Signed-off-by: Michele Calgaro --- kicker/libkicker/panelbutton.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'kicker/libkicker') diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index aaac124c2..93674f394 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -568,7 +568,7 @@ void PanelButton::drawButton(TQPainter *p) if (hasFocus() || m_hasAcceptedDrag) { int x1, y1, x2, y2; - TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2); + rect().coords(&x1, &y1, &x2, &y2); TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3); style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(), TQStyle::Style_Default, colorGroup().button()); @@ -607,7 +607,7 @@ void PanelButton::drawDeepButton(TQPainter *p) if (hasFocus() || m_hasAcceptedDrag) { int x1, y1, x2, y2; - TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2); + rect().coords(&x1, &y1, &x2, &y2); TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3); style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(), TQStyle::Style_Default, colorGroup().button()); @@ -997,7 +997,7 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) if (e->type() == TQEvent::MouseMove) { TQMouseEvent *me = TQT_TQMOUSEEVENT(e); - if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos())) && + if (rect().contains(mapFromGlobal(me->globalPos())) && ((me->state() & ControlButton) != 0 || (me->state() & ShiftButton) != 0)) { @@ -1009,7 +1009,7 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) e->type() == TQEvent::MouseButtonDblClick) { TQMouseEvent *me = TQT_TQMOUSEEVENT(e); - if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos()))) + if (rect().contains(mapFromGlobal(me->globalPos()))) { m_pressedDuringPopup = true; return true; @@ -1018,7 +1018,7 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) else if (e->type() == TQEvent::MouseButtonRelease) { TQMouseEvent *me = TQT_TQMOUSEEVENT(e); - if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos()))) + if (rect().contains(mapFromGlobal(me->globalPos()))) { if (m_pressedDuringPopup && m_popup) { -- cgit v1.2.1