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, 16 insertions, 13 deletions

diff --git a/kopete/protocols/msn/transport.h b/kopete/protocols/msn/transport.h
index eb190325..a606714b 100644
--- a/kopete/protocols/msn/transport.h
+++ b/kopete/protocols/msn/transport.h
@@ -47,15 +47,16 @@ enum TransportBridgeType
 /**
  @author Gregg Edghill <[email protected]> */
 /** @brief Represents the protocol used to send and receive message between peers. */
-class Transport : public QObject
+class Transport : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	/** @brief Creates a new instance of the class Transport. */
-    Transport(TQObject* parent, const char* name = 0l);
+    Transport(TQObject* tqparent, const char* name = 0l);
     ~Transport();
 	/** @brief Get a transport bridge with the specified address, port, type and identifier. */
-    TransportBridge* getBridge(const TQString& address, Q_UINT16 port, TransportBridgeType type, const TQString& identifier);
+    TransportBridge* getBridge(const TQString& address, TQ_UINT16 port, TransportBridgeType type, const TQString& identifier);
     /** @brief Sets the default transport bridge. */
 	void setDefaultBridge(MSNSwitchBoardSocket* mss);
 	
@@ -77,17 +78,18 @@ private:
 };
 
 /** @brief Represents the channel connecting two peers. */
-class TransportBridge : public QObject
+class TransportBridge : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	virtual ~TransportBridge();
 
 protected:
 	/** @brief Creates a new instance of the class TransportBridge with the specified address and formatter. */
-	TransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* parent, const char* name = 0l);
+	TransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* tqparent, const char* name = 0l);
 	/** @brief Creates a new instance of the class TransportBridge with the specified socket and formatter. */
-	TransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* parent, const char* name = 0l);
+	TransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* tqparent, const char* name = 0l);
 
 public:
 	/** @brief Creates a connection between two peers. */
@@ -114,7 +116,7 @@ protected:
 	KNetwork::KInetSocketAddress mAddress;
 	bool mConnected;
 	MessageFormatter *mFormatter;
-	Q_UINT32 mLength;
+	TQ_UINT32 mLength;
 	KNetwork::KClientSocketBase *mSocket;
 	bool mVerified;
 };
@@ -122,14 +124,15 @@ protected:
 class TcpTransportBridge : public TransportBridge
 {
 	Q_OBJECT
+  TQ_OBJECT
 	friend class Transport;
 	
 public:
 	virtual ~TcpTransportBridge();
 
 private:
-	TcpTransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* parent, const char* name = 0l);
-	TcpTransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* parent, const char* name = 0l);
+	TcpTransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* tqparent, const char* name = 0l);
+	TcpTransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* tqparent, const char* name = 0l);
 	
 protected slots:
 	virtual void slotOnConnect();
@@ -146,19 +149,19 @@ signals:
 	void bridgeConnectTimeout();
 	
 private:
-	class Buffer : public QByteArray
+	class Buffer : public TQByteArray
 	{
 	public:
-		Buffer(Q_UINT32 length = 0);
+		Buffer(TQ_UINT32 length = 0);
 		~Buffer();
 		
 	public:
 		void write(const TQByteArray& bytes);
-		TQByteArray read(Q_UINT32 length);
+		TQByteArray read(TQ_UINT32 length);
 	};
 	
 	Buffer mBuffer;
-	Q_UINT32 mLength;
+	TQ_UINT32 mLength;
 };