From 47c8a359c5276062c4bc17f0e82410f29081b502 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:48:06 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1157648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- krfb/srvloc/kinetinterface.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'krfb/srvloc/kinetinterface.cpp') diff --git a/krfb/srvloc/kinetinterface.cpp b/krfb/srvloc/kinetinterface.cpp index 0599dfa7..d1f45652 100644 --- a/krfb/srvloc/kinetinterface.cpp +++ b/krfb/srvloc/kinetinterface.cpp @@ -30,7 +30,7 @@ class KInetInterfacePrivate { public: - QString name; + TQString name; int flags; KInetSocketAddress *address; KInetSocketAddress *netmask; @@ -45,7 +45,7 @@ public: destination(0) { } - KInetInterfacePrivate(const QString _name, + KInetInterfacePrivate(const TQString _name, int _flags, KInetSocketAddress *_address, KInetSocketAddress *_netmask, @@ -99,7 +99,7 @@ KInetInterface::KInetInterface() : d(0) { } -KInetInterface::KInetInterface(const QString &_name, +KInetInterface::KInetInterface(const TQString &_name, int _flags, KInetSocketAddress *_address, KInetSocketAddress *_netmask, @@ -143,11 +143,11 @@ bool KInetInterface::isValid() const { return d == 0; } -QString KInetInterface::displayName() const { +TQString KInetInterface::displayName() const { return d->name; } -QString KInetInterface::name() const { +TQString KInetInterface::name() const { return d->name; } @@ -172,13 +172,13 @@ KInetSocketAddress *KInetInterface::destinationAddress() const { } KInetSocketAddress *KInetInterface::getPublicInetAddress() { - QValueVector v = getAllInterfaces(true); + TQValueVector v = getAllInterfaces(true); // TODO: first step: take the default route interface // try to find point-2-point interface, because it may be // a dial-up connection. Take it. - QValueVector::const_iterator it = v.begin(); + TQValueVector::const_iterator it = v.begin(); while (it != v.end()) { if (((*it).flags() & (PointToPoint | Up | Running)) && (!((*it).flags() & Loopback)) && @@ -247,10 +247,10 @@ namespace { } } -QValueVector KInetInterface::getAllInterfaces(bool includeLoopback) { +TQValueVector KInetInterface::getAllInterfaces(bool includeLoopback) { struct kde_ifaddrs *ads; struct kde_ifaddrs *a; - QValueVector r; + TQValueVector r; if (kde_getifaddrs(&ads)) return r; @@ -260,7 +260,7 @@ QValueVector KInetInterface::getAllInterfaces(bool includeLoopba a = a->ifa_next; continue; } - r.push_back(KInetInterface(QString::fromUtf8(a->ifa_name), + r.push_back(KInetInterface(TQString::fromUtf8(a->ifa_name), convertFlags(a->ifa_flags), createAddress(a->ifa_addr), createAddress(a->ifa_netmask), -- cgit v1.2.1