Drop TQT_BASE_OBJECT* defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

14 files changed, 18 insertions, 18 deletions

diff --git a/src/kvilib/ext/kvi_garbage.cpp b/src/kvilib/ext/kvi_garbage.cpp
index 6f13aa97..e6adb801 100644
--- a/src/kvilib/ext/kvi_garbage.cpp
+++ b/src/kvilib/ext/kvi_garbage.cpp
@@ -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();
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index 5148136f..a9080236 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -2054,7 +2054,7 @@ void KviApp::timerEvent(TQTimerEvent *e)
 {
 	if(e->timerId() != m_iHeartbeatTimerId)
 	{
-		TQT_BASE_OBJECT_NAME::timerEvent(e);
+		TQObject::timerEvent(e);
 		return;
 	}
 
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index ff06df19..d1ec58ad 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -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();
 	
diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp
index 2a5794b4..83a6da1c 100644
--- a/src/kvirc/ui/kvi_customtoolbar.cpp
+++ b/src/kvirc/ui/kvi_customtoolbar.cpp
@@ -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);
 }
 
diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp
index 8e651adc..fffb4649 100644
--- a/src/kvirc/ui/kvi_frame.cpp
+++ b/src/kvirc/ui/kvi_frame.cpp
@@ -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;
diff --git a/src/kvirc/ui/kvi_ipeditor.cpp b/src/kvirc/ui/kvi_ipeditor.cpp
index fc94552f..ea0d94d6 100644
--- a/src/kvirc/ui/kvi_ipeditor.cpp
+++ b/src/kvirc/ui/kvi_ipeditor.cpp
@@ -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;
diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp
index a043a60d..caa8f648 100644
--- a/src/kvirc/ui/kvi_mdichild.cpp
+++ b/src/kvirc/ui/kvi_mdichild.cpp
@@ -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);
diff --git a/src/kvirc/ui/kvi_modew.cpp b/src/kvirc/ui/kvi_modew.cpp
index 9f9aba00..e2af01b4 100644
--- a/src/kvirc/ui/kvi_modew.cpp
+++ b/src/kvirc/ui/kvi_modew.cpp
@@ -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())
diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp
index 80317191..2346eaa8 100644
--- a/src/kvirc/ui/kvi_taskbar.cpp
+++ b/src/kvirc/ui/kvi_taskbar.cpp
@@ -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)
 		{
diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp
index 84a9ca58..b7b845ad 100644
--- a/src/kvirc/ui/kvi_topicw.cpp
+++ b/src/kvirc/ui/kvi_topicw.cpp
@@ -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:
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);
 			}