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, 31 insertions, 29 deletions

diff --git a/src/modules/dcc/send.h b/src/modules/dcc/send.h
index 636f2b3b..a5e80be9 100644
--- a/src/modules/dcc/send.h
+++ b/src/modules/dcc/send.h
@@ -34,13 +34,13 @@
 #include "kvi_sockettype.h"
 
 #include "kvi_pointerlist.h"
-#include <qlabel.h>
-#include <qprogressbar.h>
+#include <tqlabel.h>
+#include <tqprogressbar.h>
 #include "kvi_tal_popupmenu.h"
 #include "kvi_tal_hbox.h"
 #include "kvi_tal_vbox.h"
-#include <qfile.h>
-#include <qdialog.h>
+#include <tqfile.h>
+#include <tqdialog.h>
 
 #include "kvi_filetransfer.h"
 #include "kvi_time.h"
@@ -62,7 +62,7 @@ typedef struct _KviDccSendThreadOptions
 class KviDccSendThread : public KviDccThread
 {
 public:
-	KviDccSendThread(QObject * par,kvi_socket_t fd,KviDccSendThreadOptions * opt);
+	KviDccSendThread(TQObject * par,kvi_socket_t fd,KviDccSendThreadOptions * opt);
 	~KviDccSendThread();
 private:
 	// stats: SHARED!!!
@@ -108,7 +108,7 @@ typedef struct _KviDccRecvThreadOptions
 class KviDccRecvThread : public KviDccThread
 {
 public:
-	KviDccRecvThread(QObject * par,kvi_socket_t fd,KviDccRecvThreadOptions * opt);
+	KviDccRecvThread(TQObject * par,kvi_socket_t fd,KviDccRecvThreadOptions * opt);
 	~KviDccRecvThread();
 protected:
 	KviDccRecvThreadOptions * m_pOpt;
@@ -124,7 +124,7 @@ protected:
 	KviMSecTimeInterval * m_pTimeInterval;             // used for computing the instant bandwidth
 	int                   m_iInstantReceivedBytes;
 	unsigned long         m_uInstantSpeedInterval;
-	QFile               * m_pFile;
+	TQFile               * m_pFile;
 public:
 	void initGetInfo();
 	int averageSpeed(){ return m_iAverageSpeed; };
@@ -143,23 +143,24 @@ protected:
 };
 
 class KviDccFileTransfer;
-class QSpinBox;
-class QTimer;
+class TQSpinBox;
+class TQTimer;
 
 #include "kvi_styled_controls.h"
 
-class KviDccFileTransferBandwidthDialog : public QDialog
+class KviDccFileTransferBandwidthDialog : public TQDialog
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviDccFileTransferBandwidthDialog(QWidget * pParent,KviDccFileTransfer * t);
+	KviDccFileTransferBandwidthDialog(TQWidget * pParent,KviDccFileTransfer * t);
 	~KviDccFileTransferBandwidthDialog();
 protected:
 	KviDccFileTransfer * m_pTransfer;
 	KviStyledCheckBox * m_pEnableLimitCheck;
-	QSpinBox * m_pLimitBox;
+	TQSpinBox * m_pLimitBox;
 protected:
-	virtual void closeEvent(QCloseEvent *e);
+	virtual void closeEvent(TQCloseEvent *e);
 protected slots:
 	void okClicked();
 	void cancelClicked();
@@ -167,13 +168,14 @@ protected slots:
 
 
 class KviDccMarshal;
-class QPainter;
+class TQPainter;
 class KviTalPopupMenu;
 
 class KviDccFileTransfer : public KviFileTransfer, public KviDccMarshalOutputContext
 {
-	enum GeneralStatus { Connecting , Transferring , Success , Failure };
+	enum GeneraltqStatus { Connecting , Transferring , Success , Failure };
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	KviDccFileTransfer(KviDccDescriptor * dcc);
 	~KviDccFileTransfer();
@@ -185,12 +187,12 @@ private:
 
 	KviStr                   m_szTarget;
 	KviStr                   m_szDccType;
-	QString                  m_szTransferIdString;
+	TQString                  m_szTransferIdString;
 
-	QString                  m_szStatusString;
-	GeneralStatus            m_eGeneralStatus;
+	TQString                  m_szStatusString;
+	GeneraltqStatus            m_eGeneraltqStatus;
 
-	QString                  m_szTransferLog; // html
+	TQString                  m_szTransferLog; // html
 
 	kvi_time_t               m_tTransferStartTime;
 	kvi_time_t               m_tTransferEndTime;
@@ -200,7 +202,7 @@ private:
 	unsigned int             m_uMaxBandwidth;
 	KviDccFileTransferBandwidthDialog * m_pBandwidthDialog;
 	
-	QTimer                 * m_pResumeTimer; // used to signal resume timeout
+	TQTimer                 * m_pResumeTimer; // used to signal resume timeout
 public:
 	bool resumeAccepted(const char * filename,const char * port,const char *szZeroPortTag);
 	bool doResume(const char * filename,const char * port,unsigned int filePos);
@@ -208,24 +210,24 @@ public:
 	static void init();
 	static void done();
 	static unsigned int runningTransfersCount();
-	static KviDccFileTransfer * nonFailedTransferWithLocalFileName(const QString &szLocalFileName);
+	static KviDccFileTransfer * nonFailedTransferWithLocalFileName(const TQString &szLocalFileName);
 	static unsigned int transferCount();
 	static bool handleResumeAccepted(const char * filename,const char * port,const char * szZeroPortTag);
 	static bool handleResumeRequest(const char * filename,const char * port,unsigned int filePos);
 
-	virtual bool event(QEvent *e);
+	virtual bool event(TQEvent *e);
 
 	virtual KviWindow * dccMarshalOutputWindow();
 	virtual const char * dccMarshalOutputContextString();
 
-	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 void fillStatusString(QString &szBuffer);
+	virtual void fillStatusString(TQString &szBuffer);
 	virtual bool active();
 	virtual void die();
-	virtual QString tipText();
-	virtual QString localFileName();
+	virtual TQString tipText();
+	virtual TQString localFileName();
 	
 	bool isFileUpload(){ return m_pDescriptor->isFileUpload(); };
 
@@ -237,9 +239,9 @@ public:
 protected:
 	void startConnection();
 	void listenOrConnect();
-	void addToTransferLog(const QString &s);
-	void outputAndLog(const QString &s);
-	void outputAndLog(int msgtype,const QString &s);
+	void addToTransferLog(const TQString &s);
+	void outputAndLog(const TQString &s);
+	void outputAndLog(int msgtype,const TQString &s);
 	KviWindow * eventWindow();
 protected slots:
 	void connectionInProgress();