From 19e527845958845e1fbd5b6d350e9d15c099f939 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 8 Aug 2023 12:23:00 +0900 Subject: Drop TQT_TQ*_OBJECT defines Signed-off-by: Michele Calgaro --- kommander/editor/formwindow.cpp | 6 +++--- kommander/editor/resource.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'kommander') diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp index 1c294adc..68bfab0f 100644 --- a/kommander/editor/formwindow.cpp +++ b/kommander/editor/formwindow.cpp @@ -1500,7 +1500,7 @@ void FormWindow::invalidCheckedSelections() void FormWindow::checkPreviewGeometry(TQRect & r) { - if (TQT_TQRECT_OBJECT(rect()).contains(r)) + if (rect().contains(r)) return; if (r.left() < rect().left()) r.moveTopLeft(TQPoint(0, r.top())); @@ -2444,7 +2444,7 @@ TQWidget *FormWindow::containerAt(const TQPoint &pos, TQWidget *notParentOf) TQWidget *container = 0; int depth = -1; TQWidgetList selected = selectedWidgets(); - if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(pos))) + if (rect().contains(mapFromGlobal(pos))) { container = mainContainer(); depth = widgetDepth(container); @@ -2467,7 +2467,7 @@ TQWidget *FormWindow::containerAt(const TQPoint &pos, TQWidget *notParentOf) TQWidget *w = it.current(); while (w && !w->isTopLevel()) { - if (!TQT_TQRECT_OBJECT(w->rect()).contains((w->mapFromGlobal(pos)))) + if (!w->rect().contains((w->mapFromGlobal(pos)))) break; w = w->parentWidget(); } diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp index b5de633b..e2f636a1 100644 --- a/kommander/editor/resource.cpp +++ b/kommander/editor/resource.cpp @@ -1099,9 +1099,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant num = value.toInt(); if ( w && w->inherits( "TQLayout" ) ) { if ( name == "spacing" ) - num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) ); + num = MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) ) ); else if ( name == "margin" ) - num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) ); + num = MetaDataBase::margin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) ) ); } ts << makeIndent( indent ) << "" << TQString::number( num ) << "" << endl; break; @@ -1117,9 +1117,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant unum = value.toUInt(); if ( w && w->inherits( "TQLayout" ) ) { if ( name == "spacing" ) - num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) ); + num = MetaDataBase::spacing( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) ); else if ( name == "margin" ) - num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) ); + num = MetaDataBase::margin( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) ); } ts << makeIndent( indent ) << "" << TQString::number( unum ) << "" << endl; break; -- cgit v1.2.1