From 2fa133cf6bc4c884678bd4d829163164af8ac5b9 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 8 Aug 2023 12:18:38 +0900 Subject: Drop TQT_TQ*_OBJECT defines Signed-off-by: Michele Calgaro (cherry picked from commit 809cae7dcd9211781f6671f121c552dc3d5061b3) --- src/kcolorcombo2.cpp | 2 +- src/systemtray.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kcolorcombo2.cpp b/src/kcolorcombo2.cpp index 54a8b98..345fc8f 100644 --- a/src/kcolorcombo2.cpp +++ b/src/kcolorcombo2.cpp @@ -685,7 +685,7 @@ bool KColorCombo2::eventFilter(TQObject */*object*/, TQEvent *event) case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonPress: mouseEvent = (TQMouseEvent*)event; - if ( !TQT_TQRECT_OBJECT(m_popup->rect()).contains(mouseEvent->pos()) ) { + if ( !m_popup->rect().contains(mouseEvent->pos()) ) { TQPoint globalPos = m_popup->mapToGlobal(mouseEvent->pos()); if (TQApplication::widgetAt(globalPos, /*child=*/true) == this) { // The popup is being closed by a click on the KColorCombo2 widget. diff --git a/src/systemtray.cpp b/src/systemtray.cpp index a101e66..3616e25 100644 --- a/src/systemtray.cpp +++ b/src/systemtray.cpp @@ -301,7 +301,7 @@ void SystemTray::mouseReleaseEvent(TQMouseEvent *event) { m_canDrag = false; if (event->button() == Qt::LeftButton) // Show / hide main window - if ( TQT_TQRECT_OBJECT(rect()).contains(event->pos()) ) { // Accept only if released in systemTray + if ( rect().contains(event->pos()) ) { // Accept only if released in systemTray toggleActive(); emit showPart(); event->accept(); -- cgit v1.2.1