From 4816c4a735e1704c433dbe42155bf3887180d8ea Mon Sep 17 00:00:00 2001 From: Timothy Pearson 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/msnsocket.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kopete/protocols/msn/msnsocket.h') diff --git a/kopete/protocols/msn/msnsocket.h b/kopete/protocols/msn/msnsocket.h index ad005396..5661ee41 100644 --- a/kopete/protocols/msn/msnsocket.h +++ b/kopete/protocols/msn/msnsocket.h @@ -31,7 +31,7 @@ #include "kopete_export.h" namespace KNetwork { - class KBufferedSocket; + class TDEBufferedSocket; class TDEServerSocket; } @@ -278,7 +278,7 @@ private: */ void parseLine( const TQString &str ); - KNetwork::KBufferedSocket *m_socket; + KNetwork::TDEBufferedSocket *m_socket; OnlineStatus m_onlineStatus; TQString m_server; -- cgit v1.2.1