diff options
Diffstat (limited to 'src/network/kernel')
-rw-r--r-- | src/network/kernel/qnetworkinterface.cpp | 12 | ||||
-rw-r--r-- | src/network/kernel/qnetworkproxy_generic.cpp | 2 | ||||
-rw-r--r-- | src/network/kernel/qnetworkproxy_libproxy.cpp | 4 | ||||
-rw-r--r-- | src/network/kernel/qnetworkproxy_win.cpp | 8 |
4 files changed, 13 insertions, 13 deletions
diff --git a/src/network/kernel/qnetworkinterface.cpp b/src/network/kernel/qnetworkinterface.cpp index e55e113619..8c3467a1e3 100644 --- a/src/network/kernel/qnetworkinterface.cpp +++ b/src/network/kernel/qnetworkinterface.cpp @@ -120,11 +120,11 @@ QSharedDataPointer<QNetworkInterfacePrivate> QNetworkInterfaceManager::interface QList<QSharedDataPointer<QNetworkInterfacePrivate> > QNetworkInterfaceManager::allInterfaces() { - QList<QNetworkInterfacePrivate *> list = postProcess(scan()); + const QList<QNetworkInterfacePrivate *> list = postProcess(scan()); QList<QSharedDataPointer<QNetworkInterfacePrivate> > result; result.reserve(list.size()); - foreach (QNetworkInterfacePrivate *ptr, list) + for (QNetworkInterfacePrivate *ptr : list) result << QSharedDataPointer<QNetworkInterfacePrivate>(ptr); return result; @@ -611,10 +611,10 @@ QString QNetworkInterface::interfaceNameFromIndex(int index) */ QList<QNetworkInterface> QNetworkInterface::allInterfaces() { - QList<QSharedDataPointer<QNetworkInterfacePrivate> > privs = manager()->allInterfaces(); + const QList<QSharedDataPointer<QNetworkInterfacePrivate> > privs = manager()->allInterfaces(); QList<QNetworkInterface> result; result.reserve(privs.size()); - foreach (const QSharedDataPointer<QNetworkInterfacePrivate> &p, privs) { + for (const auto &p : privs) { QNetworkInterface item; item.d = p; result << item; @@ -631,9 +631,9 @@ QList<QNetworkInterface> QNetworkInterface::allInterfaces() */ QList<QHostAddress> QNetworkInterface::allAddresses() { - QList<QSharedDataPointer<QNetworkInterfacePrivate> > privs = manager()->allInterfaces(); + const QList<QSharedDataPointer<QNetworkInterfacePrivate> > privs = manager()->allInterfaces(); QList<QHostAddress> result; - foreach (const QSharedDataPointer<QNetworkInterfacePrivate> &p, privs) { + for (const auto &p : privs) { foreach (const QNetworkAddressEntry &entry, p->addressEntries) result += entry.ip(); } diff --git a/src/network/kernel/qnetworkproxy_generic.cpp b/src/network/kernel/qnetworkproxy_generic.cpp index db1083f3e0..e69870a98c 100644 --- a/src/network/kernel/qnetworkproxy_generic.cpp +++ b/src/network/kernel/qnetworkproxy_generic.cpp @@ -59,7 +59,7 @@ static bool ignoreProxyFor(const QNetworkProxyQuery &query) const QList<QByteArray> noProxyTokens = noProxy.split(','); - foreach (const QByteArray &rawToken, noProxyTokens) { + for (const QByteArray &rawToken : noProxyTokens) { QByteArray token = rawToken.trimmed(); QString peerHostName = query.peerHostName(); diff --git a/src/network/kernel/qnetworkproxy_libproxy.cpp b/src/network/kernel/qnetworkproxy_libproxy.cpp index e89df79226..184dc6469d 100644 --- a/src/network/kernel/qnetworkproxy_libproxy.cpp +++ b/src/network/kernel/qnetworkproxy_libproxy.cpp @@ -122,10 +122,10 @@ QList<QNetworkProxy> QNetworkProxyFactory::systemProxyForQuery(const QNetworkPro return proxyList; } - QList<QUrl> rawProxies = libProxyWrapper()->getProxies(queryUrl); + const QList<QUrl> rawProxies = libProxyWrapper()->getProxies(queryUrl); bool haveDirectConnection = false; - foreach (const QUrl& url, rawProxies) { + for (const QUrl& url : rawProxies) { QNetworkProxy::ProxyType type; const QString scheme = url.scheme(); if (scheme == QLatin1String("http")) { diff --git a/src/network/kernel/qnetworkproxy_win.cpp b/src/network/kernel/qnetworkproxy_win.cpp index fe9f088062..0838227123 100644 --- a/src/network/kernel/qnetworkproxy_win.cpp +++ b/src/network/kernel/qnetworkproxy_win.cpp @@ -194,7 +194,7 @@ static bool isBypassed(const QString &host, const QStringList &bypassList) return true; // does it match the list of exclusions? - foreach (const QString &entry, bypassList) { + for (const QString &entry : bypassList) { if (entry == QLatin1String("<local>")) { if (isSimple) return true; @@ -241,7 +241,7 @@ static QList<QNetworkProxy> filterProxyListByCapabilities(const QList<QNetworkPr break; } QList<QNetworkProxy> result; - foreach (const QNetworkProxy& proxy, proxyList) { + for (const QNetworkProxy &proxy : proxyList) { if (proxy.capabilities() & requiredCaps) result.append(proxy); } @@ -251,7 +251,7 @@ static QList<QNetworkProxy> filterProxyListByCapabilities(const QList<QNetworkPr static QList<QNetworkProxy> removeDuplicateProxies(const QList<QNetworkProxy> &proxyList) { QList<QNetworkProxy> result; - foreach (QNetworkProxy proxy, proxyList) { + for (const QNetworkProxy &proxy : proxyList) { bool append = true; for (int i=0; i < result.count(); i++) { if (proxy.hostName() == result.at(i).hostName() @@ -283,7 +283,7 @@ static QList<QNetworkProxy> parseServerList(const QNetworkProxyQuery &query, con QHash<QString, QNetworkProxy> taggedProxies; const QString requiredTag = query.protocolTag(); bool checkTags = !requiredTag.isEmpty() && query.queryType() != QNetworkProxyQuery::TcpServer; //windows tags are only for clients - foreach (const QString &entry, proxyList) { + for (const QString &entry : proxyList) { int server = 0; QNetworkProxy::ProxyType proxyType = QNetworkProxy::HttpProxy; |