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/kserversocket.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tdecore/network/kserversocket.cpp') diff --git a/tdecore/network/kserversocket.cpp b/tdecore/network/kserversocket.cpp index d5a1b90bb..16a48cdf2 100644 --- a/tdecore/network/kserversocket.cpp +++ b/tdecore/network/kserversocket.cpp @@ -47,11 +47,11 @@ public: int backlog; int timeout; - bool bindWhenFound : 1, listenWhenBound : 1, useKBufferedSocket : 1; + bool bindWhenFound : 1, listenWhenBound : 1, useTDEBufferedSocket : 1; TDEServerSocketPrivate() : state(None), timeout(0), bindWhenFound(false), listenWhenBound(false), - useKBufferedSocket(true) + useTDEBufferedSocket(true) { resolver.setFlags(KResolver::Passive); resolver.setFamily(KResolver::KnownFamily); @@ -277,7 +277,7 @@ void TDEServerSocket::close() void TDEServerSocket::setAcceptBuffered(bool enable) { - d->useKBufferedSocket = enable; + d->useTDEBufferedSocket = enable; } KActiveSocketBase* TDEServerSocket::accept() @@ -319,8 +319,8 @@ KActiveSocketBase* TDEServerSocket::accept() } KStreamSocket* streamsocket; - if (d->useKBufferedSocket) - streamsocket = new KBufferedSocket(); + if (d->useTDEBufferedSocket) + streamsocket = new TDEBufferedSocket(); else streamsocket = new KStreamSocket(); streamsocket->setSocketDevice(accepted); -- cgit v1.2.1