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

2 files changed, 17 insertions, 16 deletions

diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp
index ab9aa4f1..f6398f03 100644
--- a/src/modules/iograph/libkviiograph.cpp
+++ b/src/modules/iograph/libkviiograph.cpp
@@ -34,12 +34,12 @@
 #include "kvi_locale.h"
 
 #include "kvi_pointerlist.h"
-#include <qtooltip.h>
-#include <qpointarray.h>
-#include <qpainter.h>
+#include <tqtooltip.h>
+#include <tqpointarray.h>
+#include <tqpainter.h>
 
 
-extern QPixmap                 * g_pIccMemBuffer;
+extern TQPixmap                 * g_pIccMemBuffer;
 
 
 static KviPointerList<KviIOGraphDisplay> * g_pIOGraphWidgetList;
@@ -67,7 +67,7 @@ KviIOGraphDisplay::KviIOGraphDisplay(KviIrcContextController * pController,bool
 		tip.append(__tr("Incoming traffic"));
 	}
 
-	QToolTip::add(this,tip.ptr());
+	TQToolTip::add(this,tip.ptr());
 
 	startTimer(1000);
 }
@@ -77,7 +77,7 @@ KviIOGraphDisplay::~KviIOGraphDisplay()
 	g_pIOGraphWidgetList->removeRef(this);
 }
 
-void KviIOGraphDisplay::timerEvent(QTimerEvent *e)
+void KviIOGraphDisplay::timerEvent(TQTimerEvent *e)
 {
 	unsigned int sB = console()->socket()->sentBytes();
 	unsigned int rB = console()->socket()->readBytes();
@@ -97,7 +97,7 @@ void KviIOGraphDisplay::timerEvent(QTimerEvent *e)
 	update();
 }
 
-static QCOORD horizSegments[6 * 4]=
+static TQCOORD horizSegments[6 * 4]=
 {
 	5 , 3  , KVI_IRCTOOLBARAPPLET_MAXIMUM_WIDTH - 4 , 3  ,
 	5 , 8  , KVI_IRCTOOLBARAPPLET_MAXIMUM_WIDTH - 4 , 8  ,
@@ -107,7 +107,7 @@ static QCOORD horizSegments[6 * 4]=
 	5 , 28 , KVI_IRCTOOLBARAPPLET_MAXIMUM_WIDTH - 4 , 28
 };
 
-static QCOORD vertSegments[29 * 4]=
+static TQCOORD vertSegments[29 * 4]=
 {
 	 9   , 4  , 9   , KVI_IRCTOOLBARAPPLET_MAXIMUM_HEIGHT - 5 ,
 	 14  , 4  , 14  , KVI_IRCTOOLBARAPPLET_MAXIMUM_HEIGHT - 5 ,
@@ -140,10 +140,10 @@ static QCOORD vertSegments[29 * 4]=
 	 149 , 4  , 149 , KVI_IRCTOOLBARAPPLET_MAXIMUM_HEIGHT - 5 
 };
 
-void KviIOGraphDisplay::drawContents(QPainter * p)
+void KviIOGraphDisplay::drawContents(TQPainter * p)
 {
-	static QPointArray hp(6 * 4,horizSegments);
-	static QPointArray vp(29 * 4,vertSegments);
+	static TQPointArray hp(6 * 4,horizSegments);
+	static TQPointArray vp(29 * 4,vertSegments);
 
 	p->setPen(KVI_OPTION_COLOR(KviOption_colorIrcToolBarAppletForegroundLowContrast));
 	p->drawLineSegments(hp,0,6);
@@ -199,9 +199,9 @@ void KviIOGraphDisplay::drawContents(QPainter * p)
 	}
 }
 
-QSize KviIOGraphDisplay::sizeHint() const
+TQSize KviIOGraphDisplay::tqsizeHint() const
 {
-	return QSize(KVI_IRCTOOLBARAPPLET_MAXIMUM_WIDTH,KVI_IRCTOOLBARAPPLET_MAXIMUM_HEIGHT);
+	return TQSize(KVI_IRCTOOLBARAPPLET_MAXIMUM_WIDTH,KVI_IRCTOOLBARAPPLET_MAXIMUM_HEIGHT);
 }
 
 
diff --git a/src/modules/iograph/libkviiograph.h b/src/modules/iograph/libkviiograph.h
index 9b134615..3c3d8f1a 100644
--- a/src/modules/iograph/libkviiograph.h
+++ b/src/modules/iograph/libkviiograph.h
@@ -33,6 +33,7 @@
 class KviIOGraphDisplay : public KviIrcContextGraphicalApplet
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	KviIOGraphDisplay(KviIrcContextController * pController,bool sentGraph,bool recvGraph);
 	~KviIOGraphDisplay();
@@ -45,9 +46,9 @@ protected:
 	bool m_bShowSentGraph;
 	bool m_bShowRecvGraph;
 protected:
-	virtual void drawContents(QPainter *p);
-	virtual QSize sizeHint() const;
-	virtual void timerEvent(QTimerEvent *e);
+	virtual void drawContents(TQPainter *p);
+	virtual TQSize tqsizeHint() const;
+	virtual void timerEvent(TQTimerEvent *e);
 };
 
 #endif