From 4816c4a735e1704c433dbe42155bf3887180d8ea Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 13:17:02 -0600
Subject: Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig,
 KIOBuffer, and KBuffer to avoid conflicts with KDE4

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

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

diff --git a/kopete/protocols/msn/webcam.h b/kopete/protocols/msn/webcam.h
index 64a555c5..a056fe24 100644
--- a/kopete/protocols/msn/webcam.h
+++ b/kopete/protocols/msn/webcam.h
@@ -18,7 +18,7 @@
 
 #if MSN_WEBCAM
 
-namespace KNetwork{ class TDEServerSocket; class KBufferedSocket;  }
+namespace KNetwork{ class TDEServerSocket; class TDEBufferedSocket;  }
 
 class MimicWrapper;
 class TQLabel;
@@ -55,7 +55,7 @@ class Webcam  : public TransferContext
 
 		
 		KNetwork::TDEServerSocket   *m_listener;
-		KNetwork::KBufferedSocket *m_webcamSocket;
+		KNetwork::TDEBufferedSocket *m_webcamSocket;
 		
 		enum WebcamStatus { wsNegotiating , wsConnecting, wsConnected, wsTransfer  } ;
 		
@@ -67,8 +67,8 @@ class Webcam  : public TransferContext
 		MimicWrapper *m_mimic;
 		MSNWebcamDialog *m_widget;
 				
-		TQValueList<KNetwork::KBufferedSocket* > m_allSockets;
-		TQMap<KNetwork::KBufferedSocket*, WebcamStatus> m_webcamStates;
+		TQValueList<KNetwork::TDEBufferedSocket* > m_allSockets;
+		TQMap<KNetwork::TDEBufferedSocket*, WebcamStatus> m_webcamStates;
 		
 		int m_timerId;
 		int m_timerFps;
-- 
cgit v1.2.1