From d1b610d43eef32a054c6113ec705f1c982339af8 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 8 Aug 2023 12:12:50 +0900 Subject: [PATCH] Drop TQT_TQ*_OBJECT defines Signed-off-by: Michele Calgaro --- src/gvcore/cursortracker.cpp | 4 ++-- src/gvcore/imageviewcontroller.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gvcore/cursortracker.cpp b/src/gvcore/cursortracker.cpp index fc56682..5baf1b9 100644 --- a/src/gvcore/cursortracker.cpp +++ b/src/gvcore/cursortracker.cpp @@ -48,7 +48,7 @@ bool CursorTracker::eventFilter(TQObject* object, TQEvent* _event) { switch (_event->type()) { case TQEvent::MouseMove: { TQMouseEvent* event=TQT_TQMOUSEEVENT(_event); - if (TQT_TQRECT_OBJECT(widget->rect()).contains(event->pos()) || (event->stateAfter() & Qt::LeftButton)) { + if (widget->rect().contains(event->pos()) || (event->stateAfter() & Qt::LeftButton)) { show(); move(event->globalPos().x() + 15, event->globalPos().y() + 15); } else { @@ -59,7 +59,7 @@ bool CursorTracker::eventFilter(TQObject* object, TQEvent* _event) { case TQEvent::MouseButtonRelease: { TQMouseEvent* event=TQT_TQMOUSEEVENT(_event); - if ( !TQT_TQRECT_OBJECT(widget->rect()).contains(event->pos()) ) { + if ( !widget->rect().contains(event->pos()) ) { hide(); } break; diff --git a/src/gvcore/imageviewcontroller.cpp b/src/gvcore/imageviewcontroller.cpp index 1eefa4d..f97c847 100644 --- a/src/gvcore/imageviewcontroller.cpp +++ b/src/gvcore/imageviewcontroller.cpp @@ -387,7 +387,7 @@ void ImageViewController::slotAutoHide() { if (d->mFullScreenBar) { // Do not auto hide if the cursor is over the bar TQPoint pos=d->mFullScreenBar->mapFromGlobal(TQCursor::pos()); - if (TQT_TQRECT_OBJECT(d->mFullScreenBar->rect()).contains(pos)) { + if (d->mFullScreenBar->rect().contains(pos)) { d->restartAutoHideTimer(); return; }