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, 21 insertions, 20 deletions

diff --git a/src/kvilib/net/kvi_dns.h b/src/kvilib/net/kvi_dns.h
index 3f423c24..70dbf8c1 100644
--- a/src/kvilib/net/kvi_dns.h
+++ b/src/kvilib/net/kvi_dns.h
@@ -44,29 +44,30 @@ public:
 	~KviDnsResult();
 protected:
 	int             m_iError;
-	KviPointerList<QString> * m_pHostnameList;
-	KviPointerList<QString> * m_pIpAddressList;
-	QString               m_szQuery;
+	KviPointerList<TQString> * m_pHostnameList;
+	KviPointerList<TQString> * m_pIpAddressList;
+	TQString               m_szQuery;
 public:
 	int error(){ return m_iError; };
 	// never store nor delete these pointers!
 	// (these are NEVER 0)
-	KviPointerList<QString> * hostnameList(){ return m_pHostnameList; };
-	KviPointerList<QString> * ipAddressList(){ return m_pIpAddressList; };
-	const QString &query(){ return m_szQuery; };
+	KviPointerList<TQString> * hostnameList(){ return m_pHostnameList; };
+	KviPointerList<TQString> * ipAddressList(){ return m_pIpAddressList; };
+	const TQString &query(){ return m_szQuery; };
 protected:
 	void setError(int iError){ m_iError = iError; };
-	void setQuery(const QString &query){ m_szQuery = query; };
-	void appendHostname(const QString &host);
-	void appendAddress(const QString &addr);
+	void setQuery(const TQString &query){ m_szQuery = query; };
+	void appendHostname(const TQString &host);
+	void appendAddress(const TQString &addr);
 };
 
 
 
-class KVILIB_API KviDns : public QObject, public KviHeapObject
+class KVILIB_API KviDns : public TQObject, public KviHeapObject
 {
 	Q_OBJECT
-	Q_PROPERTY(bool blockingDelete READ isRunning)
+  TQ_OBJECT
+	TQ_PROPERTY(bool blockingDelete READ isRunning)
 public:
 	KviDns();
 	~KviDns();
@@ -85,27 +86,27 @@ public:
 	//
 
 	// Lookup start
-	bool lookup(const QString &szQuery,QueryType type);
+	bool lookup(const TQString &szQuery,QueryType type);
 
 	// Current object state
 	State state(){ return m_state; };
 
 	// Results (return always non null-data..but valid results only if state() == Success or Failure)
 	int error();
-	const QString & firstHostname();
-	const QString & firstIpAddress();
+	const TQString & firstHostname();
+	const TQString & firstIpAddress();
 	int hostnameCount();
 	int ipAddressCount();
-	KviPointerList<QString> * hostnameList();
-	KviPointerList<QString> * ipAddressList();
-	const QString & query();
+	KviPointerList<TQString> * hostnameList();
+	KviPointerList<TQString> * ipAddressList();
+	const TQString & query();
 	bool isRunning() const;
 
 	// Auxiliary data store
 	void setAuxData(void * pAuxData){ m_pAuxData = pAuxData; };
 	void * releaseAuxData(){ void * pData = m_pAuxData; m_pAuxData = 0; return pData; };
 protected:
-	virtual bool event(QEvent *e);
+	virtual bool event(TQEvent *e);
 private:
 	KviDnsResult * result();
 signals:
@@ -127,11 +128,11 @@ protected:
 	KviDnsThread(KviDns * pDns);
 	~KviDnsThread();
 protected:
-	QString              m_szQuery;
+	TQString              m_szQuery;
 	KviDns::QueryType    m_queryType;
 	KviDns             * m_pParentDns;
 public:
-	void setQuery(const QString &query,KviDns::QueryType type){ m_szQuery = query; m_queryType = type; };
+	void setQuery(const TQString &query,KviDns::QueryType type){ m_szQuery = query; m_queryType = type; };
 protected:
 	virtual void run();
 	int translateDnsError(int iErr);