1 files changed, 23 insertions, 22 deletions

diff --git a/kopete/protocols/msn/p2p.h b/kopete/protocols/msn/p2p.h
index e3bdd6ff..363fb3ff 100644
--- a/kopete/protocols/msn/p2p.h
+++ b/kopete/protocols/msn/p2p.h
@@ -17,7 +17,7 @@
 #ifndef P2P_H
 #define P2P_H
 
-// Qt includes
+// TQt includes
 #include <tqobject.h>
 #include "messageformatter.h"
 
@@ -64,15 +64,15 @@ namespace P2P{
 
 	struct TransportHeader
 	{
-		Q_UINT32 sessionId;
-		Q_UINT32 identifier;
-		Q_INT64  dataOffset;
-		Q_INT64  totalDataSize;
-		Q_UINT32 dataSize;
-		Q_UINT32 flag;
-		Q_UINT32 ackSessionIdentifier;
-		Q_UINT32 ackUniqueIdentifier;
-		Q_INT64  ackDataSize;
+		TQ_UINT32 sessionId;
+		TQ_UINT32 identifier;
+		TQ_INT64  dataOffset;
+		TQ_INT64  totalDataSize;
+		TQ_UINT32 dataSize;
+		TQ_UINT32 flag;
+		TQ_UINT32 ackSessionIdentifier;
+		TQ_UINT32 ackUniqueIdentifier;
+		TQ_INT64  ackDataSize;
 	};
 
 	struct Message
@@ -84,7 +84,7 @@ namespace P2P{
 			TQString source;
 			TransportHeader header;
 			TQByteArray body;
-			Q_INT32 applicationIdentifier;
+			TQ_INT32 applicationIdentifier;
 			bool attachApplicationIdentifier;
 	};
 
@@ -93,8 +93,9 @@ namespace P2P{
 		public: static TQString createUid();
 	};
 
-	class KOPETE_EXPORT TransferContext : public QObject
+	class KOPETE_EXPORT TransferContext : public TQObject
 	{	Q_OBJECT
+  TQ_OBJECT
 		public:
 			virtual ~TransferContext();
 
@@ -103,16 +104,16 @@ namespace P2P{
 			void error();
 			virtual void processMessage(const P2P::Message& message) = 0;
 			void sendDataPreparation();
-			void sendMessage(MessageType type, const TQString& content=TQString::null, Q_INT32 flag=0, Q_INT32 appId=0);
+			void sendMessage(MessageType type, const TQString& content=TQString(), TQ_INT32 flag=0, TQ_INT32 appId=0);
 			void setType(TransferType type);
 
 		public:
-			Q_UINT32 m_sessionId;
-			Q_UINT32 m_identifier;
+			TQ_UINT32 m_sessionId;
+			TQ_UINT32 m_identifier;
 			TQFile   *m_file;
-			Q_UINT32 m_transactionId;
-			Q_UINT32 m_ackSessionIdentifier;
-			Q_UINT32 m_ackUniqueIdentifier;
+			TQ_UINT32 m_transactionId;
+			TQ_UINT32 m_ackSessionIdentifier;
+			TQ_UINT32 m_ackUniqueIdentifier;
 			Kopete::Transfer *m_transfer;
 			TQString  m_branch;
 			TQString  m_callId;
@@ -124,17 +125,17 @@ namespace P2P{
 			void readyWrite();
 
 		protected:
-			TransferContext(const TQString& contact, P2P::Dispatcher *dispatcher,Q_UINT32 sessionId);
+			TransferContext(const TQString& contact, P2P::Dispatcher *dispatcher,TQ_UINT32 sessionId);
 			void sendData(const TQByteArray& bytes);
 			void sendMessage(P2P::Message& outbound, const TQByteArray& body);
 			virtual void readyToSend();
 
-			Q_UINT32 m_baseIdentifier;
+			TQ_UINT32 m_baseIdentifier;
 			TransferDirection m_direction;
 			P2P::Dispatcher *m_dispatcher;
 			bool m_isComplete;
-			Q_INT64 m_offset;
-			Q_INT64 m_totalDataSize;
+			TQ_INT64 m_offset;
+			TQ_INT64 m_totalDataSize;
 			P2P::MessageFormatter m_messageFormatter;
 			TQString m_recipient;
 			TQString m_sender;