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, 19 deletions

diff --git a/src/modules/http/httpfiletransfer.h b/src/modules/http/httpfiletransfer.h
index e6c5006e..792205b1 100644
--- a/src/modules/http/httpfiletransfer.h
+++ b/src/modules/http/httpfiletransfer.h
@@ -30,26 +30,27 @@
 
 #include "kvi_kvs_variant.h"
 
-#include <qstringlist.h>
-#include <qtimer.h>
+#include <tqstringlist.h>
+#include <tqtimer.h>
 
-class QPainter;
+class TQPainter;
 class KviTalPopupMenu;
 
 class KviHttpFileTransfer : public KviFileTransfer
 {
-	enum GeneralStatus { Initializing, Connecting, Downloading, Success, Failure };
+	enum GeneraltqStatus { Initializing, Connecting, Downloading, Success, Failure };
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	KviHttpFileTransfer();
 	~KviHttpFileTransfer();
 private:
 	KviHttpRequest * m_pHttpRequest;
-	GeneralStatus    m_eGeneralStatus;
-	QString          m_szStatusString;
+	GeneraltqStatus    m_eGeneraltqStatus;
+	TQString          m_szStatusString;
 
-	QStringList      m_lHeaders;
-	QStringList      m_lRequest;
+	TQStringList      m_lHeaders;
+	TQStringList      m_lRequest;
 
 	kvi_time_t       m_tStartTime;
 	kvi_time_t       m_tTransferStartTime;
@@ -60,9 +61,9 @@ private:
 	bool             m_bAutoClean;
 	bool             m_bNoOutput;
 	
-	QTimer         * m_pAutoCleanTimer;
+	TQTimer         * m_pAutoCleanTimer;
 	
-	QString          m_szCompletionCallback;
+	TQString          m_szCompletionCallback;
 public:
 	KviHttpRequest * request(){ return m_pHttpRequest; };
 	static unsigned int runningTransfers();
@@ -71,28 +72,28 @@ public:
 
 	virtual bool startDownload();
 	
-	void setCompletionCallback(const QString &szCallback){ m_szCompletionCallback = szCallback; };
+	void setCompletionCallback(const TQString &szCallback){ m_szCompletionCallback = szCallback; };
 	void setMagicIdentifier(const KviKvsVariant &vIdentifier){ m_vMagicIdentifier = vIdentifier; };
 	void setNotifyCompletion(bool bNotify){ m_bNotifyCompletion = bNotify; };
 	void setAutoClean(bool bAutoClean){ m_bAutoClean = bAutoClean; };
 	void setNoOutput(bool bNoOutput){ m_bNoOutput = bNoOutput; };
 
-	virtual void displayPaint(QPainter * p,int column,int width,int height);
+	virtual void displayPaint(TQPainter * p,int column,int width,int height);
 	virtual int displayHeight(int iLineSpacing);
 	virtual void fillContextPopup(KviTalPopupMenu * m,int column);
 	virtual bool active();
 	virtual void die();
-	virtual QString tipText();
-	virtual QString localFileName();
+	virtual TQString tipText();
+	virtual TQString localFileName();
 protected slots:
-	void statusMessage(const QString &txt);
+	void statusMessage(const TQString &txt);
 	void transferTerminated(bool bSuccess);
 	void headersReceived(KviPointerHashTable<const char *,KviStr> *h);
-	void requestSent(const QStringList &sl);
+	void requestSent(const TQStringList &sl);
 
-	void resolvingHost(const QString &hostname);
-	void contactingHost(const QString &ipandport);
-	void receivedResponse(const QString &response);
+	void resolvingHost(const TQString &hostname);
+	void contactingHost(const TQString &ipandport);
+	void receivedResponse(const TQString &response);
 	void connectionEstabilished();
 
 	void abort();