Drop TQT_BASE_OBJECT* defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 3ec2ac7ee5)
r14.1.x
Michele Calgaro 1 year ago
parent c49086f688
commit 2c078f1888
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -62,13 +62,13 @@ void KviGarbageCollector::garbageSuicide()
tqDebug("Ops... garbage suicide while no garbage list");
return;
}
int idx = m_pGarbageList->findRef(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())));
int idx = m_pGarbageList->findRef(TQT_TQOBJECT(sender()));
if(idx == -1)
{
tqDebug("Ops... unregistered garbage suicide");
return;
}
m_pGarbageList->removeRef(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())));
m_pGarbageList->removeRef(TQT_TQOBJECT(sender()));
if(m_pGarbageList->isEmpty())
{
cleanup();

@ -2054,7 +2054,7 @@ void KviApp::timerEvent(TQTimerEvent *e)
{
if(e->timerId() != m_iHeartbeatTimerId)
{
TQT_BASE_OBJECT_NAME::timerEvent(e);
TQObject::timerEvent(e);
return;
}

@ -1593,7 +1593,7 @@ void KviChannel::checkChannelSync()
bool KviChannel::eventFilter(TQObject * o, TQEvent * e)
{
if(e->type() == TQEvent::FocusOut && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pTopicWidget) && \
if(e->type() == TQEvent::FocusOut && o == m_pTopicWidget &&
m_pTopicWidget->isVisible())
m_pTopicWidget->deactivate();

@ -136,7 +136,7 @@ void KviCustomToolBar::paintEvent(TQPaintEvent * e)
void KviCustomToolBar::filteredChildDestroyed()
{
if(!m_pFilteredChildren)return;
const TQObject * o = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()));
const TQObject * o = TQT_TQOBJECT(sender());
m_pFilteredChildren->remove((void *)o);
}

@ -417,7 +417,7 @@ KviAccel * KviFrame::installAccelerators(TQWidget * wnd)
void KviFrame::accelActivated(int id)
{
KviAccel * acc = (KviAccel *)TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()));
KviAccel * acc = (KviAccel *)TQT_TQOBJECT(sender());
int keys = (int)(acc->key(id));
KviTaskBarItem *item = 0;
@ -1139,7 +1139,7 @@ void KviFrame::customizeToolBars()
void KviFrame::toolbarsPopupSelected(int id)
{
const TQObject * o = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()));
const TQObject * o = TQT_TQOBJECT(sender());
if(!o)return;
if(!o->inherits("KviTalPopupMenu"))return;
const KviTalPopupMenu * p = (const KviTalPopupMenu *)o;

@ -259,7 +259,7 @@ bool KviIpEditor::eventFilter(TQObject * o,TQEvent *e)
int edIdx = -1;
for(int i=0;i<8;i++)
{
if(TQT_BASE_OBJECT(m_pEdit[i]) == TQT_BASE_OBJECT(o))
if(m_pEdit[i] == o)
{
edIdx = i;
break;

@ -491,7 +491,7 @@ void KviMdiChild::setClient(TQWidget *w)
resize(w->width()+(KVI_MDICHILD_BORDER << 1),w->height()+KVI_MDICHILD_BORDER+clientYPos);
//Reparent if needed
if(TQT_BASE_OBJECT(w->parent())!=TQT_BASE_OBJECT(this)){
if(w->parent()!=this){
//reparent to this widget , no flags , point , show it
TQPoint pnt2(KVI_MDICHILD_BORDER,clientYPos);
w->reparent(this,pnt2,true);

@ -119,7 +119,7 @@ void KviModeWidget::labelDoubleClick()
bool KviModeWidget::eventFilter( TQObject *obj, TQEvent *ev )
{
if( (TQT_BASE_OBJECT(obj)==TQT_BASE_OBJECT(m_pLineEdit)) && ( ev->type() == TQEvent::KeyPress ) )
if( (obj==m_pLineEdit) && ( ev->type() == TQEvent::KeyPress ) )
{
TQKeyEvent *keyEvent = (TQKeyEvent*)ev;
switch(keyEvent->key())

@ -1312,7 +1312,7 @@ void KviTreeTaskBar::tipRequest(KviDynamicToolTip *,const TQPoint &pnt)
bool KviTreeTaskBar::eventFilter(TQObject * o,TQEvent *e)
{
if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pListView->viewport()))
if(o == m_pListView->viewport())
{
if(e->type() == TQEvent::MouseButtonPress)
{

@ -639,7 +639,7 @@ bool KviTopicWidget::eventFilter(TQObject *object,TQEvent *e)
{
if ( !e )
return TRUE;
if(TQT_BASE_OBJECT(object)==TQT_BASE_OBJECT(m_pCompletionBox))
if(object==m_pCompletionBox)
{
switch( e->type() ) {
case TQEvent::MouseButtonPress:

@ -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())

@ -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);

@ -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);
}

@ -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);
}

Loading…
Cancel
Save