From f21aaec952493cb5688c73de6e82a569ddbd7fb2 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:36:20 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 kopete/protocols/msn/msnfiletransfersocket.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kopete/protocols/msn/msnfiletransfersocket.h')

diff --git a/kopete/protocols/msn/msnfiletransfersocket.h b/kopete/protocols/msn/msnfiletransfersocket.h
index 974dbf5e..5803cd01 100644
--- a/kopete/protocols/msn/msnfiletransfersocket.h
+++ b/kopete/protocols/msn/msnfiletransfersocket.h
@@ -26,7 +26,7 @@
 class TQFile;
 
 namespace KNetwork {
-  class KServerSocket;
+  class TDEServerSocket;
 }
 
 namespace Kopete { class Transfer; }
@@ -108,7 +108,7 @@ private:
 	TQString m_fileName;
 	Kopete::Transfer* m_kopeteTransfer;
 	TQFile *m_file ;
-	KNetwork::KServerSocket *m_server;
+	KNetwork::TDEServerSocket *m_server;
 
 	bool ready;
 
-- 
cgit v1.2.1