summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2023-08-08 12:19:03 +0900
committerMichele Calgaro <[email protected]>2023-08-08 12:19:03 +0900
commitca88704c3e4a4fd5ddc9e96e4ccf22b53816e03d (patch)
tree87ee723e3cd7728117a5839a94101f5499b42623
parentb05a12a13d0f6d1eabdc6c32fe629f4c3c89d236 (diff)
downloadkoffice-ca88704c3e4a4fd5ddc9e96e4ccf22b53816e03d.tar.gz
koffice-ca88704c3e4a4fd5ddc9e96e4ccf22b53816e03d.zip
Drop TQT_TQ*_OBJECT defines
Signed-off-by: Michele Calgaro <[email protected]>
-rw-r--r--chalk/plugins/tools/defaulttools/kis_tool_text.cpp2
-rw-r--r--chalk/ui/kobirdeyepanel.cpp4
-rw-r--r--kchart/kdchart/KDChartBarPainter.cpp2
-rw-r--r--lib/kofficeui/KoGuides.cpp2
-rw-r--r--lib/koproperty/editoritem.cpp2
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 1a2687f1..d1727f39 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 f7a9842d..46e0a585 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 874fd9c0..8c64a60f 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 ffea16c3..95fcddbf 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 2fd9c18d..d71bcac2 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();