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/kresolver.cpp | |
| 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/kresolver.cpp')
| -rw-r--r-- | tdecore/network/kresolver.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tdecore/network/kresolver.cpp b/tdecore/network/kresolver.cpp index a6ca8e45c..b9ac605c0 100644 --- a/tdecore/network/kresolver.cpp +++ b/tdecore/network/kresolver.cpp @@ -54,7 +54,7 @@ #endif // KDE -#include <klocale.h> +#include <tdelocale.h> // Us #include "kresolver.h" @@ -75,7 +75,7 @@ using namespace KNetwork::Internal; class KNetwork::KResolverEntryPrivate: public TQShared { public: - KSocketAddress addr; + TDESocketAddress addr; int socktype; int protocol; TQString canonName; @@ -93,7 +93,7 @@ KResolverEntry::KResolverEntry() : } // constructor with stuff -KResolverEntry::KResolverEntry(const KSocketAddress& addr, int socktype, int protocol, +KResolverEntry::KResolverEntry(const TDESocketAddress& addr, int socktype, int protocol, const TQString& canonName, const TQCString& encodedName) : d(new KResolverEntryPrivate) { @@ -110,7 +110,7 @@ KResolverEntry::KResolverEntry(const struct sockaddr* sa, TQ_UINT16 salen, int s const TQCString& encodedName) : d(new KResolverEntryPrivate) { - d->addr = KSocketAddress(sa, salen); + d->addr = TDESocketAddress(sa, salen); d->socktype = socktype; d->protocol = protocol; d->canonName = canonName; @@ -135,9 +135,9 @@ KResolverEntry::~KResolverEntry() } // returns the socket address -KSocketAddress KResolverEntry::address() const +TDESocketAddress KResolverEntry::address() const { - return d ? d->addr : KSocketAddress(); + return d ? d->addr : TDESocketAddress(); } // returns the length |