Replaced various '#define' with actual strings - part 5

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 236b93c7266b84269b4be5841d8575b5f3432065)

6 files changed, 17 insertions, 17 deletions

diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp
index d799b365..7c848527 100644
--- a/src/kvirc/ui/kvi_userlistview.cpp
+++ b/src/kvirc/ui/kvi_userlistview.cpp
@@ -1701,7 +1701,7 @@ void KviUserListViewArea::paintEvent(TQPaintEvent *ev)
 	//p.drawLine(1,height()-1,wdth,height()-1);
 	//p.drawLine(wdth - 1,1,wdth - 1,height());
 
-	bitBlt(TQT_TQPAINTDEVICE(this),r.left(),r.top(),TQT_TQPAINTDEVICE(pMemBuffer),r.left(),r.top(),r.width(),r.height(),TQt::CopyROP,false);
+	bitBlt(this,r.left(),r.top(),pMemBuffer,r.left(),r.top(),r.width(),r.height(),TQt::CopyROP,false);
 }
 
 void KviUserListViewArea::resizeEvent(TQResizeEvent *)
diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
index 88a0eb8c..534e6535 100644
--- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp
+++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
@@ -611,10 +611,10 @@ void KviDockWidget::paintEvent(TQPaintEvent * event)
 		erase();
 		bitBlt(this,4,4,g_pIconManager->getSmallIcon(KVI_SMALLICON_MESSAGE),0,0,16,16);
 	} else {
-		bitBlt(TQT_TQPAINTDEVICE(this),0,0,TQT_TQPAINTDEVICE(m_iOther ? ((m_iOther == 2) ? g_pDock3 : g_pDock2) : g_pDock1),0,0,12,12,TQt::CopyROP,false);
-		bitBlt(TQT_TQPAINTDEVICE(this),0,12,TQT_TQPAINTDEVICE(m_iConsoles ? ((m_iConsoles == 2) ? g_pDock3 : g_pDock2) : g_pDock1),0,12,12,12,TQt::CopyROP,false);
-		bitBlt(TQT_TQPAINTDEVICE(this),12,0,TQT_TQPAINTDEVICE(m_iQueries ? ((m_iQueries == 2) ? g_pDock3 : g_pDock2) : g_pDock1),12,0,12,12,TQt::CopyROP,false);
-		bitBlt(TQT_TQPAINTDEVICE(this),12,12,TQT_TQPAINTDEVICE(m_iChannels ? ((m_iChannels == 2) ? g_pDock3 : g_pDock2) : g_pDock1),12,12,12,12,TQt::CopyROP,false);
+		bitBlt(this,0,0,m_iOther ? ((m_iOther == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,0,12,12,TQt::CopyROP,false);
+		bitBlt(this,0,12,m_iConsoles ? ((m_iConsoles == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,12,12,12,TQt::CopyROP,false);
+		bitBlt(this,12,0,m_iQueries ? ((m_iQueries == 2) ? g_pDock3 : g_pDock2) : g_pDock1,12,0,12,12,TQt::CopyROP,false);
+		bitBlt(this,12,12,m_iChannels ? ((m_iChannels == 2) ? g_pDock3 : g_pDock2) : g_pDock1,12,12,12,12,TQt::CopyROP,false);
 	}
 }
 
diff --git a/src/modules/my/idle_x11.cpp b/src/modules/my/idle_x11.cpp
index a846a8c3..93440f93 100644
--- a/src/modules/my/idle_x11.cpp
+++ b/src/modules/my/idle_x11.cpp
@@ -80,7 +80,7 @@ bool IdlePlatform::init()
 	old_handler = XSetErrorHandler(xerrhandler);
 
 	int event_base, error_base;
-	if(XScreenSaverQueryExtension(TQT_TQPAINTDEVICE(TQApplication::desktop()->screen())->x11Display(), &event_base, &error_base)) {
+	if(XScreenSaverQueryExtension(TQApplication::desktop()->screen()->x11Display(), &event_base, &error_base)) {
 		d->ss_info = XScreenSaverAllocInfo();
 		return true;
 	}
@@ -92,7 +92,7 @@ int IdlePlatform::secondsIdle()
 {
 	if(!d->ss_info)
 		return 0;
-	if(!XScreenSaverQueryInfo(TQT_TQPAINTDEVICE(TQApplication::desktop()->screen())->x11Display(), tqt_xrootwin(), d->ss_info))
+	if(!XScreenSaverQueryInfo(TQApplication::desktop()->screen()->x11Display(), tqt_xrootwin(), d->ss_info))
 		return 0;
 	return d->ss_info->idle / 1000;
 }
diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp
index bf407f4c..341706d8 100644
--- a/src/modules/objects/class_painter.cpp
+++ b/src/modules/objects/class_painter.cpp
@@ -771,8 +771,8 @@ bool KviKvsObject_painter::functionbegin(KviKvsObjectFunctionCall *c)
 	}
 
 	TQPaintDevice * pd = 0;
-	if(pObject->inherits("KviKvsObject_pixmap"))pd =TQT_TQPAINTDEVICE(((KviKvsObject_pixmap *)pObject)->getPixmap());
-	else if (pObject->inherits("KviKvsObject_widget")) pd=TQT_TQPAINTDEVICE(((KviKvsObject_widget *)pObject)->widget());
+	if(pObject->inherits("KviKvsObject_pixmap"))pd =((KviKvsObject_pixmap *)pObject)->getPixmap();
+	else if (pObject->inherits("KviKvsObject_widget")) pd=((KviKvsObject_widget *)pObject)->widget();
 	
 	if (!pd)
 		c->warning(__tr2qs("Widget or Pixmap required "));
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 6d29f5d9..1c34f50f 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -616,8 +616,8 @@ static bool objects_kvs_cmd_bitBlt(KviKvsModuleCommandCall * c)
 	TQImage  * imgSource=0;
 	TQPaintDevice  * pdSource = 0;
 	
-	if(obSrc->inherits("KviKvsObject_pixmap")) pdSource =TQT_TQPAINTDEVICE(((KviKvsObject_pixmap *)obSrc)->getPixmap());
-	else if (obSrc->inherits("KviKvsObject_widget")) pdSource=TQT_TQPAINTDEVICE(((KviKvsObject_widget *)obSrc)->widget());
+	if(obSrc->inherits("KviKvsObject_pixmap")) pdSource =((KviKvsObject_pixmap *)obSrc)->getPixmap();
+	else if (obSrc->inherits("KviKvsObject_widget")) pdSource=((KviKvsObject_widget *)obSrc)->widget();
 	if (!pdSource)
 	{
 		c->warning(__tr2qs("Widget, Image or Pixmap required "));
@@ -625,9 +625,9 @@ static bool objects_kvs_cmd_bitBlt(KviKvsModuleCommandCall * c)
 	}
 	TQPaintDevice  * pdDest = 0;
 	if(obDst->inherits("KviKvsObject_pixmap")){
-		pdDest= TQT_TQPAINTDEVICE(((KviKvsObject_pixmap *)obDst)->getPixmap());
+		pdDest= ((KviKvsObject_pixmap *)obDst)->getPixmap();
 	}
-	else if (obDst->inherits("KviKvsObject_widget")) pdDest=TQT_TQPAINTDEVICE(((KviKvsObject_widget *)obDst)->widget());
+	else if (obDst->inherits("KviKvsObject_widget")) pdDest=((KviKvsObject_widget *)obDst)->widget();
 	if (!pdDest)
 	{
 		c->warning(__tr2qs("Widget or Pixmap required"));
@@ -711,8 +711,8 @@ static bool objects_kvs_cmd_blend(KviKvsModuleCommandCall * c)
 	}
 
 	TQPaintDevice  * pdDest = 0;
-	if(obDest->inherits("KviKvsObject_pixmap")) pdDest = TQT_TQPAINTDEVICE(((KviKvsObject_pixmap *)obDest)->getPixmap());
-	else if (obDest->inherits("KviKvsObject_widget")) pdDest=TQT_TQPAINTDEVICE(((KviKvsObject_widget *)obDest)->widget());
+	if(obDest->inherits("KviKvsObject_pixmap")) pdDest = ((KviKvsObject_pixmap *)obDest)->getPixmap();
+	else if (obDest->inherits("KviKvsObject_widget")) pdDest=((KviKvsObject_widget *)obDest)->widget();
 	
 	if (!pdDest)
 	{
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index b6741470..f4865263 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -734,7 +734,7 @@ void KviRegisteredUsersDialog::exportClicked()
 						if(!f.save(1))goto write_error;
 						TQImageIO io;
 						io.setImage(av->pixmap()->convertToImage());
-						io.setIODevice(TQT_TQIODEVICE(&f));
+						io.setIODevice(&f);
 						io.setFormat("PNG");
 						if(!io.write())goto write_error;
 					} else {
@@ -832,7 +832,7 @@ void KviRegisteredUsersDialog::importClicked()
 			TQImage img;
 			TQImageIO io;
 			io.setImage(img);
-			io.setIODevice(TQT_TQIODEVICE(&f));
+			io.setIODevice(&f);
 			io.setFormat("PNG");
 
 			if(!io.read())goto read_error;