summaryrefslogtreecommitdiffstats
path: root/tdecore/network/kstreamsocket.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
commit703fb0c89c2eee56a1e613e67a446db9d4287929 (patch)
treedd8c5ca66075cd89c2638a2b48cf78386a9870a7 /tdecore/network/kstreamsocket.h
parent818e7abec3d5d3809b6b77293558678371c16b71 (diff)
downloadtdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz
tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/network/kstreamsocket.h')
-rw-r--r--tdecore/network/kstreamsocket.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/tdecore/network/kstreamsocket.h b/tdecore/network/kstreamsocket.h
index ab90e923a..d077296c1 100644
--- a/tdecore/network/kstreamsocket.h
+++ b/tdecore/network/kstreamsocket.h
@@ -34,7 +34,7 @@ namespace KNetwork {
class KResolverEntry;
class KResolverResults;
-class KServerSocket;
+class TDEServerSocket;
class KBufferedSocket;
class KStreamSocketPrivate;
@@ -91,7 +91,7 @@ class KStreamSocketPrivate;
* }
* \endcode
*
- * @see KNetwork::KBufferedSocket, KNetwork::KServerSocket
+ * @see KNetwork::KBufferedSocket, KNetwork::TDEServerSocket
* @author Thiago Macieira <thiago@kde.org>
*/
class TDECORE_EXPORT KStreamSocket: public KClientSocketBase
@@ -241,7 +241,7 @@ private:
KStreamSocketPrivate *d;
- friend class KServerSocket;
+ friend class TDEServerSocket;
friend class KBufferedSocket;
};