TDE
/
kvirc
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kvirc
0
0
Fork 0
Code Issues Releases Wiki Activity

Drop TQT_BASE_OBJECT* defines

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/9/head
Michele Calgaro 9 months ago
parent 0130e6d75a
commit 3ec2ac7ee5
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
14 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File

4
src/kvilib/ext/kvi_garbage.cpp
Unescape View File

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

2
src/kvirc/kernel/kvi_app.cpp
Unescape View File

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

2
src/kvirc/ui/kvi_channel.cpp
Unescape View File

@ -1593,7 +1593,7 @@ void KviChannel::checkChannelSync()
bool KviChannel::eventFilter(TQObject * o, TQEvent * e) 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->isVisible())
m_pTopicWidget->deactivate(); m_pTopicWidget->deactivate();

2
src/kvirc/ui/kvi_customtoolbar.cpp
Unescape View File

@ -136,7 +136,7 @@ void KviCustomToolBar::paintEvent(TQPaintEvent * e)
void KviCustomToolBar::filteredChildDestroyed() void KviCustomToolBar::filteredChildDestroyed()
{ {
if(!m_pFilteredChildren)return; 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); m_pFilteredChildren->remove((void *)o);
} }

4
src/kvirc/ui/kvi_frame.cpp
Unescape View File

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

2
src/kvirc/ui/kvi_ipeditor.cpp
Unescape View File

@ -259,7 +259,7 @@ bool KviIpEditor::eventFilter(TQObject * o,TQEvent *e)
int edIdx = -1; int edIdx = -1;
for(int i=0;i<8;i++) 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; edIdx = i;
break; break;

2
src/kvirc/ui/kvi_mdichild.cpp
Unescape View File

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

2
src/kvirc/ui/kvi_modew.cpp
Unescape View File

@ -119,7 +119,7 @@ void KviModeWidget::labelDoubleClick()
bool KviModeWidget::eventFilter( TQObject *obj, TQEvent *ev ) 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; TQKeyEvent *keyEvent = (TQKeyEvent*)ev;
switch(keyEvent->key()) switch(keyEvent->key())

2
src/kvirc/ui/kvi_taskbar.cpp
Unescape View File

@ -1312,7 +1312,7 @@ void KviTreeTaskBar::tipRequest(KviDynamicToolTip *,const TQPoint &pnt)
bool KviTreeTaskBar::eventFilter(TQObject * o,TQEvent *e) 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) if(e->type() == TQEvent::MouseButtonPress)
{ {

2
src/kvirc/ui/kvi_topicw.cpp
Unescape View File

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

2
src/modules/filetransferwindow/filetransferwindow.cpp
Unescape View File

@ -203,7 +203,7 @@ KviFileTransferWindow::~KviFileTransferWindow()
bool KviFileTransferWindow::eventFilter( TQObject *obj, TQEvent *ev ) 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; TQKeyEvent *keyEvent = (TQKeyEvent*)ev;
switch(keyEvent->key()) switch(keyEvent->key())

6
src/modules/options/instances.cpp
Unescape View File

@ -3489,7 +3489,7 @@ void KviOptionsInstanceManager::cleanup(KviModule * m)
void KviOptionsInstanceManager::widgetDestroyed() 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(e)e->pWidget = 0;
if(g_iOptionWidgetInstances > 0)g_iOptionWidgetInstances--; if(g_iOptionWidgetInstances > 0)g_iOptionWidgetInstances--;
@ -3504,7 +3504,7 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
g_iOptionWidgetInstances++; g_iOptionWidgetInstances++;
connect(e->pWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed())); 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(); TQWidget * oldPar = (TQWidget *)e->pWidget->parent();
e->pWidget->reparent(par,TQPoint(0,0)); e->pWidget->reparent(par,TQPoint(0,0));
@ -3552,7 +3552,7 @@ KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(con
{ {
for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next()) 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) if(e->pChildList)
{ {
KviOptionsWidgetInstanceEntry * e2 = findInstanceEntry(ptr,e->pChildList); KviOptionsWidgetInstanceEntry * e2 = findInstanceEntry(ptr,e->pChildList);

2
src/modules/options/libkvioptions.cpp
Unescape View File

@ -108,7 +108,7 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
d->reparent(0,TQPoint(0,0),true); d->reparent(0,TQPoint(0,0),true);
} }
} else { } 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); d->reparent(c->window()->frame()->splitter(),TQPoint(0,0),true);
} }

2
src/modules/reguser/libkvireguser.cpp
Unescape View File

@ -120,7 +120,7 @@ static bool reguser_kvs_cmd_edit(KviKvsModuleCommandCall * c)
g_pRegisteredUsersDialog->reparent(0,TQPoint(0,0),true); g_pRegisteredUsersDialog->reparent(0,TQPoint(0,0),true);
} }
} else { } 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); g_pRegisteredUsersDialog->reparent(c->window()->frame()->splitter(),TQPoint(0,0),true);
} }

Write Preview
Loading…
Cancel
Save