summaryrefslogtreecommitdiffstats
path: root/tdecore/network/kbufferedsocket.cpp
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/kbufferedsocket.cpp
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/kbufferedsocket.cpp')
-rw-r--r--tdecore/network/kbufferedsocket.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/tdecore/network/kbufferedsocket.cpp b/tdecore/network/kbufferedsocket.cpp
index 3566bde93..1b08d121e 100644
--- a/tdecore/network/kbufferedsocket.cpp
+++ b/tdecore/network/kbufferedsocket.cpp
@@ -38,7 +38,7 @@ using namespace KNetwork::Internal;
class KNetwork::KBufferedSocketPrivate
{
public:
- mutable KSocketBuffer *input, *output;
+ mutable TDESocketBuffer *input, *output;
KBufferedSocketPrivate()
{
@@ -64,7 +64,7 @@ KBufferedSocket::~KBufferedSocket()
delete d;
}
-void KBufferedSocket::setSocketDevice(KSocketDevice* device)
+void KBufferedSocket::setSocketDevice(TDESocketDevice* device)
{
KStreamSocket::setSocketDevice(device);
device->setBlocking(false);
@@ -134,7 +134,7 @@ TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
return KStreamSocket::tqreadBlock(data, maxlen);
}
-TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from)
+TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from)
{
from = peerAddress();
return tqreadBlock(data, maxlen);
@@ -156,7 +156,7 @@ TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen)
return KStreamSocket::peekBlock(data, maxlen);
}
-TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from)
{
from = peerAddress();
return peekBlock(data, maxlen);
@@ -193,7 +193,7 @@ TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len
}
TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG maxlen,
- const KSocketAddress&)
+ const TDESocketAddress&)
{
// ignore the third parameter
return tqwriteBlock(data, maxlen);
@@ -256,7 +256,7 @@ void KBufferedSocket::setInputBuffering(bool enable)
}
else if (d->input == 0L)
{
- d->input = new KSocketBuffer;
+ d->input = new TDESocketBuffer;
}
}
@@ -275,7 +275,7 @@ void KBufferedSocket::setOutputBuffering(bool enable)
}
else if (d->output == 0L)
{
- d->output = new KSocketBuffer;
+ d->output = new TDESocketBuffer;
}
}