Remove various '#define' strings - part 6

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit eab2995851748c44d333fe168a1c141ccee193ab)

5 files changed, 16 insertions, 16 deletions

diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp
index 8e51d943..4acb85ce 100644
--- a/src/modules/dcc/canvas.cpp
+++ b/src/modules/dcc/canvas.cpp
@@ -119,7 +119,7 @@ KviDccCanvas::~KviDccCanvas()
 //		delete m_pSlaveThread;
 //		m_pSlaveThread = 0;
 //	}
-	KviThreadManager::killPendingEvents(TQT_TQOBJECT(this));
+	KviThreadManager::killPendingEvents(this);
 //	delete m_pDescriptor;
 //	delete m_pMarshal;
 }
diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index 51f4dbdb..252f789c 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -1240,7 +1240,7 @@ TQWidget * KviVariantTableItem::createEditor() const
 			TQString sz;
 			sz.setNum(m_property.toInt());
 			e->setText(sz);
-			e->setValidator(new TQIntValidator(TQT_TQOBJECT(e)));
+			e->setValidator(new TQIntValidator(e));
 			return e;
 		}
 		break;
@@ -1250,7 +1250,7 @@ TQWidget * KviVariantTableItem::createEditor() const
 			TQString sz;
 			sz.setNum(m_property.toInt());
 			e->setText(sz);
-			TQIntValidator * i = new TQIntValidator(TQT_TQOBJECT(e));
+			TQIntValidator * i = new TQIntValidator(e);
 			i->setBottom(0);
 			e->setValidator(i);
 			return e;
@@ -1493,7 +1493,7 @@ void KviCanvasItemPropertiesWidget::editItem(TQCanvasItem * it)
 KviCanvasWidget::KviCanvasWidget(TQWidget * par)
 : TQWidget(par,"canvas_widget")
 {
-	m_pCanvas = new TQCanvas(TQT_TQOBJECT(this));
+	m_pCanvas = new TQCanvas(this);
 //#warning "Make this size as parameter of Dcc ?"
 	m_pCanvas->resize(648,480);
 	m_pMenuBar = new TQMenuBar(this);
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 59ee9c2c..67f5647f 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -132,7 +132,7 @@ KviDccChat::~KviDccChat()
 		delete m_pSlaveThread;
 		m_pSlaveThread = 0;
 	}
-	KviThreadManager::killPendingEvents(TQT_TQOBJECT(this));
+	KviThreadManager::killPendingEvents(this);
 }
 
 void KviDccChat::textViewRightClicked()
@@ -537,7 +537,7 @@ void KviDccChat::connected()
 
 
 KviDccChatThread::KviDccChatThread(KviWindow *wnd,kvi_socket_t fd)
-: KviDccThread(TQT_TQOBJECT(wnd),fd)
+: KviDccThread(wnd,fd)
 {
 	m_pOutBuffers = new KviPointerList<KviDataBuffer>;
 	m_pOutBuffers->setAutoDelete(true);
diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp
index 6f2426d7..01d4a3b4 100644
--- a/src/modules/dcc/dialogs.cpp
+++ b/src/modules/dcc/dialogs.cpp
@@ -82,14 +82,14 @@ void KviDccAcceptBox::acceptClicked()
 {
 	hide();
 	emit accepted(this,m_pDescriptor);
-	g_pApp->collectGarbage(TQT_TQOBJECT(this));
+	g_pApp->collectGarbage(this);
 }
 
 void KviDccAcceptBox::rejectClicked()
 {
 	hide();
 	emit rejected(this,m_pDescriptor);
-	g_pApp->collectGarbage(TQT_TQOBJECT(this));
+	g_pApp->collectGarbage(this);
 }
 
 void KviDccAcceptBox::closeEvent(TQCloseEvent *e)
@@ -97,7 +97,7 @@ void KviDccAcceptBox::closeEvent(TQCloseEvent *e)
 	hide();
 	e->ignore();
 	emit rejected(this,m_pDescriptor);
-	g_pApp->collectGarbage(TQT_TQOBJECT(this));
+	g_pApp->collectGarbage(this);
 }
 
 void KviDccAcceptBox::showEvent(TQShowEvent *e)
@@ -154,7 +154,7 @@ void KviDccRenameBox::closeEvent(TQCloseEvent *e)
 	if(m_pDescriptor)
 	{
 		emit cancelSelected(this,m_pDescriptor);
-		g_pApp->collectGarbage(TQT_TQOBJECT(this));
+		g_pApp->collectGarbage(this);
 	}
 }
 
@@ -169,14 +169,14 @@ void KviDccRenameBox::renameClicked()
 {
 	hide();
 	emit renameSelected(this,m_pDescriptor);
-	g_pApp->collectGarbage(TQT_TQOBJECT(this));
+	g_pApp->collectGarbage(this);
 }
 
 void KviDccRenameBox::overwriteClicked()
 {
 	hide();
 	emit overwriteSelected(this,m_pDescriptor);
-	g_pApp->collectGarbage(TQT_TQOBJECT(this));
+	g_pApp->collectGarbage(this);
 }
 
 void KviDccRenameBox::resumeClicked()
@@ -184,14 +184,14 @@ void KviDccRenameBox::resumeClicked()
 	hide();
 	m_pDescriptor->bResume = true;
 	emit overwriteSelected(this,m_pDescriptor);
-	g_pApp->collectGarbage(TQT_TQOBJECT(this));
+	g_pApp->collectGarbage(this);
 }
 
 void KviDccRenameBox::cancelClicked()
 {
 	hide();
 	emit cancelSelected(this,m_pDescriptor);
-	g_pApp->collectGarbage(TQT_TQOBJECT(this));
+	g_pApp->collectGarbage(this);
 }
 
 
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index 95963e95..6b5267b6 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -119,7 +119,7 @@ static KviDccVoiceCodec * kvi_dcc_voice_get_codec(const char * codecName)
 
 
 KviDccVoiceThread::KviDccVoiceThread(KviWindow * wnd,kvi_socket_t fd,KviDccVoiceThreadOptions * opt)
-: KviDccThread(TQT_TQOBJECT(wnd),fd)
+: KviDccThread(wnd,fd)
 {
 #ifndef COMPILE_DISABLE_DCC_VOICE
 	m_pOpt = opt;
@@ -725,7 +725,7 @@ KviDccVoice::~KviDccVoice()
 		m_pSlaveThread = 0;
 	}
 
-	KviThreadManager::killPendingEvents(TQT_TQOBJECT(this));
+	KviThreadManager::killPendingEvents(this);
 
 	delete m_pUpdateTimer;
 //	delete m_pDescriptor;