summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/msn/msnsocket.h
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 13:17:02 -0600
committerTimothy Pearson <[email protected]>2013-01-25 13:17:02 -0600
commit4816c4a735e1704c433dbe42155bf3887180d8ea (patch)
tree868b82f46bee5214e7b8251e79ce56d4c1453c9a /kopete/protocols/msn/msnsocket.h
parentf21aaec952493cb5688c73de6e82a569ddbd7fb2 (diff)
downloadtdenetwork-4816c4a735e1704c433dbe42155bf3887180d8ea.tar.gz
tdenetwork-4816c4a735e1704c433dbe42155bf3887180d8ea.zip
Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4
Diffstat (limited to 'kopete/protocols/msn/msnsocket.h')
-rw-r--r--kopete/protocols/msn/msnsocket.h4
1 files changed, 2 insertions, 2 deletions
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;