From d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 13:15:51 -0600 Subject: Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4 --- tdecore/network/kstreamsocket.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tdecore/network/kstreamsocket.h') diff --git a/tdecore/network/kstreamsocket.h b/tdecore/network/kstreamsocket.h index d077296c1..c1f9e5848 100644 --- a/tdecore/network/kstreamsocket.h +++ b/tdecore/network/kstreamsocket.h @@ -35,7 +35,7 @@ namespace KNetwork { class KResolverEntry; class KResolverResults; class TDEServerSocket; -class KBufferedSocket; +class TDEBufferedSocket; class KStreamSocketPrivate; /** @class KStreamSocket kstreamsocket.h kstreamsocket.h @@ -50,7 +50,7 @@ class KStreamSocketPrivate; * * KStreamSocket objects are thread-safe and can be used in auxiliary * threads (i.e., not the thread in which the Qt event loop runs in). - * Note that KBufferedSocket cannot be used reliably in an auxiliary thread. + * Note that TDEBufferedSocket cannot be used reliably in an auxiliary thread. * * Sample usage: * \code @@ -91,7 +91,7 @@ class KStreamSocketPrivate; * } * \endcode * - * @see KNetwork::KBufferedSocket, KNetwork::TDEServerSocket + * @see KNetwork::TDEBufferedSocket, KNetwork::TDEServerSocket * @author Thiago Macieira */ class TDECORE_EXPORT KStreamSocket: public KClientSocketBase @@ -242,7 +242,7 @@ private: KStreamSocketPrivate *d; friend class TDEServerSocket; - friend class KBufferedSocket; + friend class TDEBufferedSocket; }; } // namespace KNetwork -- cgit v1.2.1