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, 7 insertions, 6 deletions

diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
index cb9fe204..65c0672b 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
+++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
@@ -33,7 +33,7 @@ class EventTransfer;
 	CoreProtocol receives data in addIncomingData, and passes to wireToTransfer.
 	wireToTransfer detects an event.
 		Passes whole chunk to EventProtocol ( as TQByteArray )
-		In to EventProtocol - QByteArray
+		In to EventProtocol - TQByteArray
 		Returned from EventProtocol - EventTransfer *, bytes read, set state?
 	EventProtocol tries to parse data into eventTransfer
 	If not complete, sets state to NeedMore and returns 0
@@ -50,7 +50,7 @@ class EventTransfer;
 	All Events contain an event code, and a source ( a DN )
 	NOTHANDLED indicates that there is no further data and we don't handle events of that type, because they are not sent by the server
 	NONE indicates there is no further data
-	STATUSTEXT, GUID, MESSAGE indicate a string encoded in the usual GroupWise binary string encoding: a UINT32 containing the string length in little-endian, followed by the string itself, as UTF-8 encoded unicode.  The string length value includes a terminating NUL, so when converting to a TQString, subtract one from the string length.
+	STATUSTEXT, GUID, MESSAGE indicate a string encoded in the usual GroupWise binary string encoding: a UINT32 containing the string length in little-endian, followed by the string itself, as UTF-8 encoded tqunicode.  The string length value includes a terminating NUL, so when converting to a TQString, subtract one from the string length.
 	FLAGS contains a UINT32 containing the server's flags for this conference.  See gwerror.h for the possible values and meanings of these flags.  Only Logging has been observed in practice.
 
 	All events are timestamped with the local time on receipt.
@@ -58,10 +58,10 @@ class EventTransfer;
 	From gwerror.h:
 	enum Event {		InvalidRecipient 		= 101,
 							NOTHANDLED
-						UndeliverableStatus 	= 102,
+						UndeliverabletqStatus 	= 102,
 							NOTHANDLED * 
 						StatusChange 			= 103,
-							Q_UINT16 STATUS
+							TQ_UINT16 STATUS
 							STATUSTEXT
 						ContactAdd 				= 104,
 							NOTHANDLED
@@ -109,8 +109,9 @@ class EventTransfer;
 class EventProtocol : public InputProtocolBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    EventProtocol(TQObject *parent = 0, const char *name = 0);
+    EventProtocol(TQObject *tqparent = 0, const char *name = 0);
     ~EventProtocol();
 	/** 
 	 * Attempt to parse the supplied data into an @ref EventTransfer object.  
@@ -124,7 +125,7 @@ protected:
 	/**
 	 * Reads a conference's flags
 	 */
-	bool readFlags( Q_UINT32 &flags);
+	bool readFlags( TQ_UINT32 &flags);
 };
 
 #endif