summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-08-08 12:23:00 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-08-08 17:59:52 +0900
commit6d4be82cca25be5191a287efca0ebaaa2777875e (patch)
tree0957449ad4c5cd5fda5db49913058266a9252824
parent309a672de7972615f51ea2dc4a987deecf8b18b5 (diff)
downloadtdewebdev-6d4be82cca25be5191a287efca0ebaaa2777875e.tar.gz
tdewebdev-6d4be82cca25be5191a287efca0ebaaa2777875e.zip
Drop TQT_TQ*_OBJECT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 19e527845958845e1fbd5b6d350e9d15c099f939)
-rw-r--r--kommander/editor/formwindow.cpp6
-rw-r--r--kommander/editor/resource.cpp8
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp2
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp2
4 files changed, 9 insertions, 9 deletions
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 ) << "<number>" << TQString::number( num ) << "</number>" << 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 ) << "<number>" << TQString::number( unum ) << "</number>" << endl;
break;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
index 515c27dc..a0885b0a 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
@@ -1121,7 +1121,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
}
}
}
- if ( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pWinIcon) ) || ( TQT_TQOBJECT(obj) == TQT_BASE_OBJECT(m_pUnixIcon) ) )
+ if ( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pWinIcon) ) || ( obj == TQT_BASE_OBJECT(m_pUnixIcon) ) )
{
// in case we clicked on the icon button
if ( m_timeMeasure.elapsed() > TQApplication::doubleClickInterval() )
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp
index f90263b3..f07e1a56 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp
@@ -146,7 +146,7 @@ void KMdiChildFrmCaption::mouseMoveEvent( TQMouseEvent *e )
TQPoint relMousePosInChildArea = m_pParent->m_pManager->mapFromGlobal( e->globalPos() );
// mouse out of child area? stop child frame dragging
- if ( !TQT_TQRECT_OBJECT(m_pParent->m_pManager->rect()).contains( relMousePosInChildArea ) )
+ if ( !m_pParent->m_pManager->rect().contains( relMousePosInChildArea ) )
{
if ( relMousePosInChildArea.x() < 0 )
relMousePosInChildArea.rx() = 0;