diff options
| author | Michele Calgaro <[email protected]> | 2023-08-12 18:42:03 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2023-08-15 21:01:21 +0900 |
| commit | 2c078f1888431b5ad02b3258684682fffc7cfa88 (patch) | |
| tree | 68c2fbac03297c5e1efe354a39946a028a4ef02e /src/modules | |
| parent | c49086f688a52b2b466951b228b85af92ae64cc7 (diff) | |
| download | kvirc-2c078f1888431b5ad02b3258684682fffc7cfa88.tar.gz kvirc-2c078f1888431b5ad02b3258684682fffc7cfa88.zip | |
Drop TQT_BASE_OBJECT* defines
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 3ec2ac7ee5d10c5bbc2d4d1af67c5be874f985a5)
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/filetransferwindow/filetransferwindow.cpp | 2 | ||||
| -rw-r--r-- | src/modules/options/instances.cpp | 6 | ||||
| -rw-r--r-- | src/modules/options/libkvioptions.cpp | 2 | ||||
| -rw-r--r-- | src/modules/reguser/libkvireguser.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp index 44c34312..23d1ffae 100644 --- a/src/modules/filetransferwindow/filetransferwindow.cpp +++ b/src/modules/filetransferwindow/filetransferwindow.cpp @@ -203,7 +203,7 @@ KviFileTransferWindow::~KviFileTransferWindow() bool KviFileTransferWindow::eventFilter( TQObject *obj, TQEvent *ev ) { - if( (TQT_BASE_OBJECT(obj)==TQT_BASE_OBJECT(m_pListView)) && ( ev->type() == TQEvent::KeyPress ) ) + if( (obj==m_pListView) && ( ev->type() == TQEvent::KeyPress ) ) { TQKeyEvent *keyEvent = (TQKeyEvent*)ev; switch(keyEvent->key()) 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<TQT_BASE_OBJECT_NAME*>(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); } diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp index d40bfab4..8319531e 100644 --- a/src/modules/reguser/libkvireguser.cpp +++ b/src/modules/reguser/libkvireguser.cpp @@ -120,7 +120,7 @@ static bool reguser_kvs_cmd_edit(KviKvsModuleCommandCall * c) g_pRegisteredUsersDialog->reparent(0,TQPoint(0,0),true); } } else { - if(TQT_BASE_OBJECT(g_pRegisteredUsersDialog->parent()) != TQT_BASE_OBJECT(c->window()->frame()->splitter())) + if(g_pRegisteredUsersDialog->parent() != c->window()->frame()->splitter()) { g_pRegisteredUsersDialog->reparent(c->window()->frame()->splitter(),TQPoint(0,0),true); } |