diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
commit | 10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch) | |
tree | 4bc444c00a79e88105f2cfce5b6209994c413ca0 /kdecore/network/kresolverstandardworkers.cpp | |
parent | 307136d8eef0ba133b78ceee8e901138d4c996a1 (diff) | |
download | tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore/network/kresolverstandardworkers.cpp')
-rw-r--r-- | kdecore/network/kresolverstandardworkers.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/kdecore/network/kresolverstandardworkers.cpp b/kdecore/network/kresolverstandardworkers.cpp index 401158cab..f64803ced 100644 --- a/kdecore/network/kresolverstandardworkers.cpp +++ b/kdecore/network/kresolverstandardworkers.cpp @@ -140,11 +140,11 @@ bool KBlacklistWorker::isBlacklisted(const TQString& host) return false; // KDE4: QLatin1String - TQString ascii = TQString::tqfromLatin1(KResolver::domainToAscii(host)); + TQString ascii = TQString::fromLatin1(KResolver::domainToAscii(host)); TQMutexLocker locker(&blacklistMutex); - // now tqfind out if this hostname is present + // now find out if this hostname is present TQStringList::ConstIterator it = blacklist.constBegin(), end = blacklist.constEnd(); for ( ; it != end; ++it) @@ -208,12 +208,12 @@ namespace { public: TQCString m_hostname; // might be different! - TQ_UINT16 m_port; + Q_UINT16 m_port; int m_scopeid; int m_af; KResolverResults& results; - GetHostByNameThread(const char * hostname, TQ_UINT16 port, + GetHostByNameThread(const char * hostname, Q_UINT16 port, int scopeid, int af, KResolverResults* res) : m_hostname(hostname), m_port(port), m_scopeid(scopeid), m_af(af), results(*res) @@ -251,7 +251,7 @@ namespace // check blacklist if (m_af != AF_INET && - KBlacklistWorker::isBlacklisted(TQString::tqfromLatin1(m_hostname))) + KBlacklistWorker::isBlacklisted(TQString::fromLatin1(m_hostname))) break; # ifdef USE_GETHOSTBYNAME2_R @@ -358,7 +358,7 @@ namespace if (socktype == 0) socktype = SOCK_STREAM; // default - TQString canon = KResolver::domainToUnicode(TQString::tqfromLatin1(he->h_name)); + TQString canon = KResolver::domainToUnicode(TQString::fromLatin1(he->h_name)); KInetSocketAddress sa; sa.setPort(m_port); if (he->h_addrtype != AF_INET) @@ -404,7 +404,7 @@ namespace { // check blacklist if ((m_af != AF_INET && m_af != AF_UNSPEC) && - KBlacklistWorker::isBlacklisted(TQString::tqfromLatin1(m_node))) + KBlacklistWorker::isBlacklisted(TQString::fromLatin1(m_node))) { results.setError(KResolver::NoName); finished(); @@ -547,11 +547,11 @@ bool KStandardWorker::sanityCheck() if (!nodeName().isEmpty()) { TQString node = nodeName(); - if (node.tqfind('%') != -1) - node.truncate(node.tqfind('%')); + if (node.find('%') != -1) + node.truncate(node.find('%')); - if (node.isEmpty() || node == TQString::tqfromLatin1("*") || - node == TQString::tqfromLatin1("localhost")) + if (node.isEmpty() || node == TQString::fromLatin1("*") || + node == TQString::fromLatin1("localhost")) m_encodedName.truncate(0); else { @@ -584,7 +584,7 @@ bool KStandardWorker::resolveScopeId() { // we must test the original name, not the encoded one scopeid = 0; - int pos = nodeName().tqfindRev('%'); + int pos = nodeName().findRev('%'); if (pos == -1) return true; @@ -608,7 +608,7 @@ bool KStandardWorker::resolveScopeId() bool KStandardWorker::resolveService() { - // tqfind the service first + // find the service first bool ok; port = serviceName().toUInt(&ok); if (!ok) @@ -616,7 +616,7 @@ bool KStandardWorker::resolveService() // service name does not contain a port number // must be a name - if (serviceName().isEmpty() || serviceName().compare(TQString::tqfromLatin1("*")) == 0) + if (serviceName().isEmpty() || serviceName().compare(TQString::fromLatin1("*")) == 0) port = 0; else { @@ -648,7 +648,7 @@ bool KStandardWorker::resolveService() } // it worked, we have a port number - port = (TQ_UINT16)result; + port = (Q_UINT16)result; } } @@ -704,7 +704,7 @@ bool KStandardWorker::resolveNumerically() // no Internet address is wanted! return (flags() & KResolver::NoResolve); - // now try to tqfind results + // now try to find results if (!resolveScopeId() || !resolveService()) return (flags() & KResolver::NoResolve); @@ -712,7 +712,7 @@ bool KStandardWorker::resolveNumerically() // now try to resolve the hostname numerically KInetSocketAddress sa; setError(KResolver::NoError); - sa.setHost(KIpAddress(TQString::tqfromLatin1(m_encodedName))); + sa.setHost(KIpAddress(TQString::fromLatin1(m_encodedName))); // if it failed, the length was reset to 0 bool ok = sa.length() != 0; @@ -827,16 +827,16 @@ bool KStandardWorker::preprocess() // check if the user wants something we know about #ifdef AF_INET6 -# define tqmask (KResolver::IPv6Family | KResolver::IPv4Family | KResolver::UnixFamily) +# define mask (KResolver::IPv6Family | KResolver::IPv4Family | KResolver::UnixFamily) #else -# define tqmask (KResolver::IPv4Family | KResolver::UnixFamily) +# define mask (KResolver::IPv4Family | KResolver::UnixFamily) #endif - if ((familyMask() & tqmask) == 0) + if ((familyMask() & mask) == 0) // errr... nothing we know about return false; -#undef tqmask +#undef mask return true; // it's ok } @@ -862,7 +862,7 @@ bool KStandardWorker::run() // these are the family types that we know of struct { - KResolver::SocketFamilies tqmask; + KResolver::SocketFamilies mask; int af; } families[] = { { KResolver::IPv4Family, AF_INET } #ifdef AF_INET6 @@ -874,7 +874,7 @@ bool KStandardWorker::run() resultList.setAutoDelete(true); for (int i = 0; i < familyCount; i++) - if (familyMask() & families[i].tqmask) + if (familyMask() & families[i].mask) { #ifdef AF_INET6 if (skipIPv6 && families[i].af == AF_INET6) |