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, 4 insertions, 3 deletions

diff --git a/kopete/protocols/oscar/liboscar/oscarclientstream.h b/kopete/protocols/oscar/liboscar/oscarclientstream.h
index fc08f158..f5ab752d 100644
--- a/kopete/protocols/oscar/liboscar/oscarclientstream.h
+++ b/kopete/protocols/oscar/liboscar/oscarclientstream.h
@@ -34,6 +34,7 @@ class TQHostAddress;
 class ClientStream : public Stream
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	enum Error {
 		ErrConnection = ErrCustom,  // Connection error, ask Connector-subclass what's up
@@ -73,7 +74,7 @@ public:
 		BindConflict                // resource in-use
 	};
 
-	ClientStream(Connector *conn, TQObject *parent=0);
+	ClientStream(Connector *conn, TQObject *tqparent=0);
 	~ClientStream();
 
 	void connectToServer(const TQString& server, bool auth=true);
@@ -85,7 +86,7 @@ public:
 	void setUsername(const TQString &s);
 	void setPassword(const TQString &s);
 
-	void setLocalAddr(const TQHostAddress &addr, Q_UINT16 port);
+	void setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port);
 
 	void close();
 	
@@ -158,7 +159,7 @@ private:
 	/** 
 	 * convert internal method representation to wire
 	 */
-	static char* encode_method(Q_UINT8 method);
+	static char* encode_method(TQ_UINT8 method);
 };
 
 #endif