From ca88704c3e4a4fd5ddc9e96e4ccf22b53816e03d Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 8 Aug 2023 12:19:03 +0900 Subject: [PATCH] Drop TQT_TQ*_OBJECT defines Signed-off-by: Michele Calgaro --- chalk/plugins/tools/defaulttools/kis_tool_text.cpp | 2 +- chalk/ui/kobirdeyepanel.cpp | 4 ++-- kchart/kdchart/KDChartBarPainter.cpp | 2 +- lib/kofficeui/KoGuides.cpp | 2 +- lib/koproperty/editoritem.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cpp b/chalk/plugins/tools/defaulttools/kis_tool_text.cpp index 1a2687f13..d1727f394 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_text.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_text.cpp @@ -101,7 +101,7 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e) } TQFontMetrics metrics(m_font); - TQRect boundingRect = TQT_TQRECT_OBJECT(metrics.boundingRect(text)).normalize(); + TQRect boundingRect = metrics.boundingRect(text).normalize(); int xB = - boundingRect.x(); int yB = - boundingRect.y(); diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp index f7a9842d5..46e0a5853 100644 --- a/chalk/ui/kobirdeyepanel.cpp +++ b/chalk/ui/kobirdeyepanel.cpp @@ -403,7 +403,7 @@ void KoBirdEyePanel::handleMouseMove(TQPoint p) break; default: case DragHandleNone: - if (TQT_TQRECT_OBJECT(m_thumbnail.rect()).contains(p)) { + if (m_thumbnail.rect().contains(p)) { cursor = TQt::PointingHandCursor; } else { cursor = TQt::arrowCursor; @@ -462,7 +462,7 @@ void KoBirdEyePanel::handleMousePress(TQPoint p) enumDragHandle dragHandle = dragHandleAt(p); if (dragHandle == DragHandleNone) { - if (TQT_TQRECT_OBJECT(m_thumbnail.rect()).contains(p)) { + if (m_thumbnail.rect().contains(p)) { // Snap visible area centre to p and begin a centre drag. diff --git a/kchart/kdchart/KDChartBarPainter.cpp b/kchart/kdchart/KDChartBarPainter.cpp index 874fd9c08..8c64a60f3 100644 --- a/kchart/kdchart/KDChartBarPainter.cpp +++ b/kchart/kdchart/KDChartBarPainter.cpp @@ -1613,7 +1613,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter, } else { // just store a rectangle if NOT in 3-D bar mode region = new KDChartDataRegion( dataset, value, chart, - TQT_TQRECT_OBJECT(pointArrayList->first().boundingRect()) ); + pointArrayList->first().boundingRect() ); delete pointArrayList; } /*tqDebug("KDChartDataRegion stored! x: %i y: %i w: %i h: %i", diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp index ffea16c35..95fcddbfd 100644 --- a/lib/kofficeui/KoGuides.cpp +++ b/lib/kofficeui/KoGuides.cpp @@ -235,7 +235,7 @@ bool KoGuides::mouseReleaseEvent( TQMouseEvent *e ) if ( m_guideLines[GL_SELECTED].count() == 1 ) { int x1, y1, x2, y2; - TQT_TQRECT_OBJECT(m_view->canvas()->rect()).coords( &x1, &y1, &x2, &y2 ); + m_view->canvas()->rect().coords( &x1, &y1, &x2, &y2 ); TQPoint gp( m_view->canvas()->mapFromGlobal( e->globalPos() ) ); if ( m_guideLines[GL_SELECTED].first()->orientation == Qt::Vertical ) { diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp index 2fd9c18d2..d71bcac2f 100644 --- a/lib/koproperty/editoritem.cpp +++ b/lib/koproperty/editoritem.cpp @@ -239,7 +239,7 @@ void GroupContainer::setContents( TQWidget* contents ) bool GroupContainer::event( TQEvent * e ) { if (e->type()==TQEvent::MouseButtonPress) { TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if (me->button() == Qt::LeftButton && d->contents && TQT_TQRECT_OBJECT(d->groupWidget->rect()).contains(me->pos())) { + if (me->button() == Qt::LeftButton && d->contents && d->groupWidget->rect().contains(me->pos())) { d->groupWidget->setOpen(!d->groupWidget->isOpen()); if (d->groupWidget->isOpen()) d->contents->show();