diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
---|---|---|
committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
tree | c76702a7f6310fbe9d437e347535422e836e94e9 /tdecore/network/ksockssocketdevice.h | |
parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdecore/network/ksockssocketdevice.h')
-rw-r--r-- | tdecore/network/ksockssocketdevice.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tdecore/network/ksockssocketdevice.h b/tdecore/network/ksockssocketdevice.h index 5c93b6d8c..2a83c0adc 100644 --- a/tdecore/network/ksockssocketdevice.h +++ b/tdecore/network/ksockssocketdevice.h @@ -28,7 +28,7 @@ namespace KNetwork { * @class KSocksSocketDevice ksockssocketdevice.h ksockssocketdevice.h * @brief The low-level class for SOCKS proxying. * - * This class reimplements several functions from @ref KSocketDevice in order + * This class reimplements several functions from @ref TDESocketDevice in order * to implement SOCKS support. * * This works by using KSocks. @@ -37,13 +37,13 @@ namespace KNetwork { * * @warning This code is untested! */ -class TDECORE_EXPORT KSocksSocketDevice: public KSocketDevice +class TDECORE_EXPORT KSocksSocketDevice: public TDESocketDevice { public: /** * Constructor. */ - KSocksSocketDevice(const KSocketBase* = 0L); + KSocksSocketDevice(const TDESocketBase* = 0L); /** * Construct from a file descriptor. @@ -84,34 +84,34 @@ public: * Overrides reading. */ virtual TQ_LONG tqreadBlock(char *data, TQ_ULONG maxlen); - virtual TQ_LONG tqreadBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from); + virtual TQ_LONG tqreadBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from); /** * Overrides peeking. */ virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen); - virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from); + virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from); /** * Overrides writing. */ virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len); - virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const KSocketAddress& to); + virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to); /** * Overrides getting socket address. */ - virtual KSocketAddress localAddress() const; + virtual TDESocketAddress localAddress() const; /** * Overrides getting peer address. */ - virtual KSocketAddress peerAddress() const; + virtual TDESocketAddress peerAddress() const; /** * Overrides getting external address. */ - virtual KSocketAddress externalAddress() const; + virtual TDESocketAddress externalAddress() const; /** * Overrides polling. @@ -121,7 +121,7 @@ public: private: static void initSocks(); - friend class KSocketDevice; + friend class TDESocketDevice; }; } // namespace KNetwork |