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

diff --git a/kopete/protocols/groupwise/libgroupwise/gwerror.h b/kopete/protocols/groupwise/libgroupwise/gwerror.h
index 52a5ef36..a6afa5c8 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwerror.h
+++ b/kopete/protocols/groupwise/libgroupwise/gwerror.h
@@ -23,7 +23,7 @@
 #include <tqmap.h>
 #include <tqstring.h>
 
-typedef Q_UINT16 NMERR_T;
+typedef TQ_UINT16 NMERR_T;
 #define GROUPWISE_DEBUG_GLOBAL 14190
 #define GROUPWISE_DEBUG_LIBGW 14191
 #define GROUPWISE_DEBUG_RAW 14192
@@ -36,7 +36,7 @@ typedef Q_UINT16 NMERR_T;
 
 namespace GroupWise
 {
-	enum Status {	Unknown = 0,
+	enum tqStatus {	Unknown = 0,
 					Offline = 1,
 					Available = 2,
 					Busy = 3,
@@ -58,7 +58,7 @@ namespace GroupWise
 				};
 	
 	enum Event {		InvalidRecipient 		= 101,
-						UndeliverableStatus 	= 102,
+						UndeliverabletqStatus 	= 102,
 						StatusChange 			= 103,
 						ContactAdd 				= 104,
 						ConferenceClosed 		= 105,
@@ -115,7 +115,7 @@ namespace GroupWise
 		ConferenceGuid guid;
 		TQString user;
 		TQDateTime timeStamp;
-		Q_UINT32 flags;
+		TQ_UINT32 flags;
 		TQString message;
 	};
 	
@@ -123,14 +123,14 @@ namespace GroupWise
 	{
 		uint id; 
 		uint sequence;
-		uint parentId;
+		uint tqparentId;
 		TQString name;
 	};
 	
 	struct ContactItem
 	{
 		uint id;
-		uint parentId;
+		uint tqparentId;
 		uint sequence;
 		TQString dn;
 		TQString displayName;
@@ -164,9 +164,9 @@ namespace GroupWise
 		int operation;
 	};
 
-	struct CustomStatus
+	struct CustomtqStatus
 	{
-		GroupWise::Status status;
+		GroupWise::tqStatus status;
 		TQString name;
 		TQString autoReply;
 	};