From 9b20575304b1aead7bd9bda4bbb43b7bf55ec6bf Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 8 Aug 2023 12:12:19 +0900 Subject: Drop TQT_TQ*_OBJECT defines Signed-off-by: Michele Calgaro --- digikam/digikam/albumiconviewfilter.cpp | 2 +- digikam/digikam/kdateedit.cpp | 2 +- digikam/libs/widgets/common/dcursortracker.cpp | 6 +++--- digikam/libs/widgets/common/statuszoombar.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/digikam/digikam/albumiconviewfilter.cpp b/digikam/digikam/albumiconviewfilter.cpp index e45566b..6d14616 100644 --- a/digikam/digikam/albumiconviewfilter.cpp +++ b/digikam/digikam/albumiconviewfilter.cpp @@ -191,7 +191,7 @@ bool AlbumIconViewFilter::eventFilter(TQObject *object, TQEvent *e) if (e->type() == TQEvent::MouseButtonRelease) { TQMouseEvent* event = TQT_TQMOUSEEVENT(e); - if ( TQT_TQRECT_OBJECT(widget->rect()).contains(event->pos()) && d->led->ledColor() != StatusLed::Gray) + if ( widget->rect().contains(event->pos()) && d->led->ledColor() != StatusLed::Gray) { // Reset all filters settings. d->textFilter->setText(TQString()); diff --git a/digikam/digikam/kdateedit.cpp b/digikam/digikam/kdateedit.cpp index 020f77d..486841d 100644 --- a/digikam/digikam/kdateedit.cpp +++ b/digikam/digikam/kdateedit.cpp @@ -299,7 +299,7 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event ) case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonPress: { TQMouseEvent *mouseEvent = (TQMouseEvent*)event; - if ( !TQT_TQRECT_OBJECT(mPopup->rect()).contains( mouseEvent->pos() ) ) { + if ( !mPopup->rect().contains( mouseEvent->pos() ) ) { TQPoint globalPos = mPopup->mapToGlobal( mouseEvent->pos() ); if ( TQApplication::widgetAt( globalPos, true ) == this ) { // The date picker is being closed by a click on the diff --git a/digikam/libs/widgets/common/dcursortracker.cpp b/digikam/libs/widgets/common/dcursortracker.cpp index 2e3ae53..951439b 100644 --- a/digikam/libs/widgets/common/dcursortracker.cpp +++ b/digikam/libs/widgets/common/dcursortracker.cpp @@ -65,8 +65,8 @@ bool DCursorTracker::eventFilter(TQObject *object, TQEvent *e) case TQEvent::MouseMove: { TQMouseEvent *event = TQT_TQMOUSEEVENT(e); - if (m_enable && (TQT_TQRECT_OBJECT(widget->rect()).contains(event->pos()) || - (event->stateAfter() & Qt::LeftButton))) + if (m_enable && (widget->rect().contains(event->pos()) || + (event->stateAfter() & Qt::LeftButton))) { show(); TQPoint p = widget->mapToGlobal(TQPoint(widget->width()/2, 0)); @@ -82,7 +82,7 @@ bool DCursorTracker::eventFilter(TQObject *object, TQEvent *e) case TQEvent::MouseButtonRelease: { TQMouseEvent* event = TQT_TQMOUSEEVENT(e); - if ( !TQT_TQRECT_OBJECT(widget->rect()).contains(event->pos()) ) + if ( !widget->rect().contains(event->pos()) ) { hide(); } diff --git a/digikam/libs/widgets/common/statuszoombar.cpp b/digikam/libs/widgets/common/statuszoombar.cpp index 2bc4e06..3fe5658 100644 --- a/digikam/libs/widgets/common/statuszoombar.cpp +++ b/digikam/libs/widgets/common/statuszoombar.cpp @@ -56,7 +56,7 @@ TQSliderReverseWheel::~TQSliderReverseWheel() void TQSliderReverseWheel::wheelEvent(TQWheelEvent * e) { - if ( e->orientation() != orientation() && !TQT_TQRECT_OBJECT(rect()).contains(e->pos()) ) + if ( e->orientation() != orientation() && !rect().contains(e->pos()) ) return; static float offset = 0; -- cgit v1.2.1