diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:35:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:35:07 -0600 |
| commit | 703fb0c89c2eee56a1e613e67a446db9d4287929 (patch) | |
| tree | dd8c5ca66075cd89c2638a2b48cf78386a9870a7 /tdecore/network/kclientsocketbase.cpp | |
| parent | 818e7abec3d5d3809b6b77293558678371c16b71 (diff) | |
| download | tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/network/kclientsocketbase.cpp')
| -rw-r--r-- | tdecore/network/kclientsocketbase.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tdecore/network/kclientsocketbase.cpp b/tdecore/network/kclientsocketbase.cpp index 780a5ec71..eb8e4883b 100644 --- a/tdecore/network/kclientsocketbase.cpp +++ b/tdecore/network/kclientsocketbase.cpp @@ -83,7 +83,7 @@ void KClientSocketBase::setState(SocketState state) bool KClientSocketBase::setSocketOptions(int opts) { TQMutexLocker locker(mutex()); - KSocketBase::setSocketOptions(opts); // call parent + TDESocketBase::setSocketOptions(opts); // call parent // don't create the device unnecessarily if (hasDevice()) @@ -323,7 +323,7 @@ TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) return retval; } -TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from) +TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from) { resetError(); TQ_LONG retval = socketDevice()->tqreadBlock(data, maxlen, from); @@ -347,7 +347,7 @@ TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen) return retval; } -TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) +TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from) { resetError(); TQ_LONG retval = socketDevice()->peekBlock(data, maxlen, from); @@ -371,7 +371,7 @@ TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG l return retval; } -TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to) +TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to) { resetError(); TQ_LONG retval = socketDevice()->tqwriteBlock(data, len, to); @@ -383,12 +383,12 @@ TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG l return retval; } -KSocketAddress KClientSocketBase::localAddress() const +TDESocketAddress KClientSocketBase::localAddress() const { return socketDevice()->localAddress(); } -KSocketAddress KClientSocketBase::peerAddress() const +TDESocketAddress KClientSocketBase::peerAddress() const { return socketDevice()->peerAddress(); } |