TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


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

1 files changed, 11 insertions, 8 deletions

diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.h b/kopete/protocols/jabber/libiris/cutestuff/network/socks.h
index 00ed09b4..d61fef1a 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.h
@@ -29,9 +29,10 @@ class TQHostAddress;
 class SocksClient;
 class SocksServer;
 
-class SocksUDP : public QObject
+class SocksUDP : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	~SocksUDP();
 
@@ -55,12 +56,13 @@ private:
 class SocksClient : public ByteStream
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth };
 	enum Method { AuthNone=0x0001, AuthUsername=0x0002 };
 	enum Request { ReqConnect, ReqUDPAssociate };
-	SocksClient(TQObject *parent=0);
-	SocksClient(int, TQObject *parent=0);
+	SocksClient(TQObject *tqparent=0);
+	SocksClient(int, TQObject *tqparent=0);
 	~SocksClient();
 
 	bool isIncoming() const;
@@ -86,11 +88,11 @@ public:
 
 	// remote address
 	TQHostAddress peerAddress() const;
-	Q_UINT16 peerPort() const;
+	TQ_UINT16 peerPort() const;
 
 	// udp
 	TQString udpAddress() const;
-	Q_UINT16 udpPort() const;
+	TQ_UINT16 udpPort() const;
 	SocksUDP *createUDP(const TQString &host, int port, const TQHostAddress &routeAddr, int routePort);
 
 signals:
@@ -125,15 +127,16 @@ private:
 	void writeData(const TQByteArray &a);
 };
 
-class SocksServer : public QObject
+class SocksServer : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	SocksServer(TQObject *parent=0);
+	SocksServer(TQObject *tqparent=0);
 	~SocksServer();
 
 	bool isActive() const;
-	bool listen(Q_UINT16 port, bool udp=false);
+	bool listen(TQ_UINT16 port, bool udp=false);
 	void stop();
 	int port() const;
 	TQHostAddress address() const;