TQt4 port kvirc

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1238719 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 20 insertions, 20 deletions

diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp
index 48aeb1e8..30018f8a 100644
--- a/src/modules/objects/class_pixmap.cpp
+++ b/src/modules/objects/class_pixmap.cpp
@@ -25,7 +25,7 @@
 #include "kvi_debug.h"
 
 #include "kvi_locale.h"
-#include <qfile.h>
+#include <tqfile.h>
 
 /*
 	@doc:	pixmap
@@ -77,8 +77,8 @@ KVSO_END_REGISTERCLASS(KviKvsObject_pixmap)
 
 
 KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_pixmap,KviKvsObject)	
-	m_pPixmap=new QPixmap();
-	m_pImage=new QImage();
+	m_pPixmap=new TQPixmap();
+	m_pImage=new TQImage();
 	bPixmapModified=false;
 	bImageModified=false;
 KVSO_END_CONSTRUCTOR(KviKvsObject_pixmap)
@@ -116,7 +116,7 @@ bool KviKvsObject_pixmap::functionfill(KviKvsObjectFunctionCall *c)
 		return true;
 	}
 	bPixmapModified=true;
-	m_pPixmap->fill(((QWidget *)(ob->object())),iXoffset,iYoffset);
+	m_pPixmap->fill(((TQWidget *)(ob->object())),iXoffset,iYoffset);
 	return true;
 }
 
@@ -130,7 +130,7 @@ bool KviKvsObject_pixmap::functionscale(KviKvsObjectFunctionCall *c)
 	#ifdef COMPILE_USE_QT4
 		*m_pPixmap = m_pPixmap->scaled((m_pPixmap->width() * uScaleX), (m_pPixmap->height() * uScaleX));
 	#else
-		QWMatrix wm;
+		TQWMatrix wm;
 		wm.scale(uScaleX, uScaleY);
 		*m_pPixmap = m_pPixmap->xForm(wm);
 	#endif
@@ -145,11 +145,11 @@ bool KviKvsObject_pixmap::functionrotate(KviKvsObjectFunctionCall *c)
 		KVSO_PARAMETER("a",KVS_PT_REAL,0,uDegrees)
 	KVSO_PARAMETERS_END(c)
 	#ifdef COMPILE_USE_QT4
-		QMatrix m;
+		TQMatrix m;
 		m.rotate(uDegrees);
 		*m_pPixmap = m_pPixmap->transformed(m);
 	#else
-		QWMatrix wm;
+		TQWMatrix wm;
 		wm.rotate(uDegrees);
 		*m_pPixmap = m_pPixmap->xForm(wm);
 	#endif
@@ -172,12 +172,12 @@ bool KviKvsObject_pixmap::functionresize(KviKvsObjectFunctionCall *c)
 
 bool KviKvsObject_pixmap::functionload(KviKvsObjectFunctionCall *c)
 {
-	QString szFile;
+	TQString szFile;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("file",KVS_PT_STRING,0,szFile)
 	KVSO_PARAMETERS_END(c)
 	
-	if(!QFile::exists(szFile))
+	if(!TQFile::exists(szFile))
 	{
 		c->warning(__tr2qs("I can't find the specified file %Q."),&szFile);
         return true;
@@ -228,7 +228,7 @@ bool KviKvsObject_pixmap::functionsetOpacity(KviKvsObjectFunctionCall *c)
 		c->warning(__tr2qs("Destination must be a pixmap object"));
 		return true;
 	}
-	QImage *buffer=((KviKvsObject_pixmap *)pObDest)->getImage();
+	TQImage *buffer=((KviKvsObject_pixmap *)pObDest)->getImage();
 	((KviKvsObject_pixmap *)pObDest)->imageChanged();
 	if (bPixmapModified) {
 		*m_pImage=m_pPixmap->convertToImage();
@@ -273,18 +273,18 @@ if(uXoffset+uWidth>m_pImage->width())
 		
 	for(int y = uYoffset;y<iHedge;y++)
 	{
-		QRgb * dst = (QRgb *)buffer->scanLine(y);
-		QRgb * src = (QRgb *)m_pImage->scanLine(y);
+		TQRgb * dst = (TQRgb *)buffer->scanLine(y);
+		TQRgb * src = (TQRgb *)m_pImage->scanLine(y);
 		src += uXoffset;
-		QRgb * end;
+		TQRgb * end;
 		end  = src + iWedge;
 		while(src < end)
 		{
-			*dst = qRgba(
-						(int)(qRed(*src)),
-						(int)(qGreen(*src)),
-						(int)(qBlue(*src)),
-						(int)(qAlpha(*src)*dOpacity)
+			*dst = tqRgba(
+						(int)(tqRed(*src)),
+						(int)(tqGreen(*src)),
+						(int)(tqBlue(*src)),
+						(int)(tqAlpha(*src)*dOpacity)
 						);
 			src++;
 			dst++;
@@ -294,7 +294,7 @@ if(uXoffset+uWidth>m_pImage->width())
 }
 
 
-QPixmap * KviKvsObject_pixmap::getPixmap() 
+TQPixmap * KviKvsObject_pixmap::getPixmap() 
 {
 	if (bImageModified) {
 		m_pPixmap->convertFromImage(*m_pImage);
@@ -302,7 +302,7 @@ QPixmap * KviKvsObject_pixmap::getPixmap()
 	}
 	return m_pPixmap;
 }
-QImage * KviKvsObject_pixmap::getImage()
+TQImage * KviKvsObject_pixmap::getImage()
 {
 	if (bPixmapModified) {
 		*m_pImage=m_pPixmap->convertToImage();