From 3ec2ac7ee5d10c5bbc2d4d1af67c5be874f985a5 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 12 Aug 2023 18:42:03 +0900 Subject: Drop TQT_BASE_OBJECT* defines Signed-off-by: Michele Calgaro --- src/modules/options/instances.cpp | 6 +++--- src/modules/options/libkvioptions.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/modules/options') diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp index 5a4eba38..a91cf149 100644 --- a/src/modules/options/instances.cpp +++ b/src/modules/options/instances.cpp @@ -3489,7 +3489,7 @@ void KviOptionsInstanceManager::cleanup(KviModule * m) void KviOptionsInstanceManager::widgetDestroyed() { - KviOptionsWidgetInstanceEntry * e = findInstanceEntry(TQT_TQOBJECT(const_cast(sender())),m_pInstanceTree); + KviOptionsWidgetInstanceEntry * e = findInstanceEntry(TQT_TQOBJECT(sender()),m_pInstanceTree); if(e)e->pWidget = 0; if(g_iOptionWidgetInstances > 0)g_iOptionWidgetInstances--; @@ -3504,7 +3504,7 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan g_iOptionWidgetInstances++; connect(e->pWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed())); } - if(TQT_BASE_OBJECT(e->pWidget->parent()) != TQT_BASE_OBJECT(par)) + if(e->pWidget->parent() != par) { TQWidget * oldPar = (TQWidget *)e->pWidget->parent(); e->pWidget->reparent(par,TQPoint(0,0)); @@ -3552,7 +3552,7 @@ KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(con { for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next()) { - if(TQT_BASE_OBJECT_CONST(ptr) == TQT_BASE_OBJECT(e->pWidget))return e; + if(ptr == e->pWidget)return e; if(e->pChildList) { KviOptionsWidgetInstanceEntry * e2 = findInstanceEntry(ptr,e->pChildList); diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp index 809fd55d..73568fff 100644 --- a/src/modules/options/libkvioptions.cpp +++ b/src/modules/options/libkvioptions.cpp @@ -108,7 +108,7 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c) d->reparent(0,TQPoint(0,0),true); } } else { - if(TQT_BASE_OBJECT(d->parent()) != TQT_BASE_OBJECT(c->window()->frame()->splitter())) + if(d->parent() != c->window()->frame()->splitter()) { d->reparent(c->window()->frame()->splitter(),TQPoint(0,0),true); } -- cgit v1.2.1