From 703fb0c89c2eee56a1e613e67a446db9d4287929 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:35:07 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- tdecore/network/kbufferedsocket.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tdecore/network/kbufferedsocket.h') diff --git a/tdecore/network/kbufferedsocket.h b/tdecore/network/kbufferedsocket.h index 93bee08f3..158a5a434 100644 --- a/tdecore/network/kbufferedsocket.h +++ b/tdecore/network/kbufferedsocket.h @@ -52,7 +52,7 @@ class KBufferedSocketPrivate; * imposed by Qt's TQSocketNotifier. If you want to use a socket * in an auxiliary thread, please use KStreamSocket. * - * @see KNetwork::KStreamSocket, KNetwork::KServerSocket + * @see KNetwork::KStreamSocket, KNetwork::TDEServerSocket * @author Thiago Macieira */ class TDECORE_EXPORT KBufferedSocket: public KStreamSocket @@ -79,7 +79,7 @@ public: /** * Be sure to catch new devices. */ - virtual void setSocketDevice(KSocketDevice* device); + virtual void setSocketDevice(TDESocketDevice* device); protected: /** @@ -122,7 +122,7 @@ public: * * The @p from parameter is always set to @ref peerAddress() */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from); + virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from); /** * Peeks data from the socket. @@ -135,7 +135,7 @@ public: * * The @p from parameter is always set to @ref peerAddress() */ - virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from); + virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress &from); /** * Writes data to the socket. @@ -148,7 +148,7 @@ public: * * The @p to parameter is discarded. */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to); + virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to); /** * Catch changes. -- cgit v1.2.3