summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/msn/p2p.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/p2p.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/p2p.h')
-rw-r--r--kopete/protocols/msn/p2p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/kopete/protocols/msn/p2p.h b/kopete/protocols/msn/p2p.h
index e98e7364..55a7866a 100644
--- a/kopete/protocols/msn/p2p.h
+++ b/kopete/protocols/msn/p2p.h
@@ -28,7 +28,7 @@
namespace Kopete { class Transfer; }
namespace Kopete { struct FileTransferInfo; }
namespace P2P { class Dispatcher; }
-namespace KNetwork { class KBufferedSocket; }
+namespace KNetwork { class TDEBufferedSocket; }
class TQFile;
class KTempFile;
@@ -139,7 +139,7 @@ namespace P2P{
P2P::MessageFormatter m_messageFormatter;
TQString m_recipient;
TQString m_sender;
- KNetwork::KBufferedSocket *m_socket;
+ KNetwork::TDEBufferedSocket *m_socket;
CommunicationState m_state;
TransferType m_type;
};