From 036b40403260c4b5de256e8118a90ec04538a312 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Tue, 26 Jan 2016 14:38:54 +0100
Subject: QtNetwork: eradicate Q_FOREACH loops [already const]

... (or trivially marked const) local variables or
parameters, by replacing them with C++11 range-for
loops.

Also ported one indexed loop.

Change-Id: Idddcac48ce7527b1ea674671ceb9aaf4d31fb42e
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
---
 src/network/bearer/qnetworkconfigmanager_p.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/network/bearer')

diff --git a/src/network/bearer/qnetworkconfigmanager_p.cpp b/src/network/bearer/qnetworkconfigmanager_p.cpp
index f2a79319a1..e9bf99628c 100644
--- a/src/network/bearer/qnetworkconfigmanager_p.cpp
+++ b/src/network/bearer/qnetworkconfigmanager_p.cpp
@@ -100,7 +100,7 @@ QNetworkConfiguration QNetworkConfigurationManagerPrivate::defaultConfiguration(
 {
     QMutexLocker locker(&mutex);
 
-    foreach (QBearerEngine *engine, sessionEngines) {
+    for (QBearerEngine *engine : sessionEngines) {
         QNetworkConfigurationPrivatePointer ptr = engine->defaultConfiguration();
         if (ptr) {
             QNetworkConfiguration config;
@@ -114,7 +114,7 @@ QNetworkConfiguration QNetworkConfigurationManagerPrivate::defaultConfiguration(
     // Return first active snap
     QNetworkConfigurationPrivatePointer defaultConfiguration;
 
-    foreach (QBearerEngine *engine, sessionEngines) {
+    for (QBearerEngine *engine : sessionEngines) {
         QHash<QString, QNetworkConfigurationPrivatePointer>::Iterator it;
         QHash<QString, QNetworkConfigurationPrivatePointer>::Iterator end;
 
@@ -156,7 +156,7 @@ QNetworkConfiguration QNetworkConfigurationManagerPrivate::defaultConfiguration(
             6. Discovered Other
     */
 
-    foreach (QBearerEngine *engine, sessionEngines) {
+    for (QBearerEngine *engine : sessionEngines) {
         QHash<QString, QNetworkConfigurationPrivatePointer>::Iterator it;
         QHash<QString, QNetworkConfigurationPrivatePointer>::Iterator end;
 
@@ -219,7 +219,7 @@ QList<QNetworkConfiguration> QNetworkConfigurationManagerPrivate::allConfigurati
 
     QMutexLocker locker(&mutex);
 
-    foreach (QBearerEngine *engine, sessionEngines) {
+    for (QBearerEngine *engine : sessionEngines) {
         QHash<QString, QNetworkConfigurationPrivatePointer>::Iterator it;
         QHash<QString, QNetworkConfigurationPrivatePointer>::Iterator end;
 
@@ -263,7 +263,7 @@ QNetworkConfiguration QNetworkConfigurationManagerPrivate::configurationFromIden
 
     QMutexLocker locker(&mutex);
 
-    foreach (QBearerEngine *engine, sessionEngines) {
+    for (QBearerEngine *engine : sessionEngines) {
         QMutexLocker locker(&engine->mutex);
         if (auto ptr = engine->accessPointConfigurations.value(identifier)) {
             item.d = std::move(ptr);
@@ -297,7 +297,7 @@ QNetworkConfigurationManager::Capabilities QNetworkConfigurationManagerPrivate::
 
     QNetworkConfigurationManager::Capabilities capFlags;
 
-    foreach (QBearerEngine *engine, sessionEngines)
+    for (QBearerEngine *engine : sessionEngines)
         capFlags |= engine->capabilities();
 
     return capFlags;
@@ -442,11 +442,10 @@ void QNetworkConfigurationManagerPrivate::updateConfigurations()
 
     if (firstUpdate) {
         firstUpdate = false;
-        QList<QBearerEngine*> enginesToInitialize = sessionEngines; //shallow copy the list in case it is modified when we unlock mutex
+        const QList<QBearerEngine*> enginesToInitialize = sessionEngines; //shallow copy the list in case it is modified when we unlock mutex
         locker.unlock();
-        foreach (QBearerEngine* engine, enginesToInitialize) {
+        for (QBearerEngine* engine : enginesToInitialize)
             QMetaObject::invokeMethod(engine, "initialize", Qt::BlockingQueuedConnection);
-        }
     }
 }
 
-- 
cgit v1.2.3