bearer plugins: eradicate Java-style iterators and Q_FOREACH

This is the simple part of the job, removing Q_FOREACH loops
which are obviously safe to be replaced by C++11 range-for.

In QNetworkManagerEngine::sessionStateForId(), instead of
iterating over QHash::keys(), iterate over the QHash
directly (using C++11 range-for, as we're only using the
values, not the keys).

In QNetworkManagerEngine::connectToId(), simplify the loop
body by merging three identical if blocks into one.

Saves ~1.7KiB accumulated over the three Linux bearer plugins:
connman, generic, nm (optimized GCC 6.1 Linux AMD64 build).

Change-Id: Ic66139c25f7e2173f5a919927e269b873334d2c8
Reviewed-by: Lorn Potter <lorn.potter@canonical.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/src/plugins/bearer/connman/qconnmanservice_linux.cpp b/src/plugins/bearer/connman/qconnmanservice_linux.cpp
index 7fbbe2cd07..bc89f540fc 100644
--- a/src/plugins/bearer/connman/qconnmanservice_linux.cpp
+++ b/src/plugins/bearer/connman/qconnmanservice_linux.cpp
@@ -144,10 +144,9 @@ void QConnmanManagerInterface::servicesReply(QDBusPendingCallWatcher *call)
         qDebug() << serv_reply.error().message();
     } else {
         servicesList.clear(); //connman list changes order
-        ConnmanMap connmanobj;
-        Q_FOREACH (connmanobj, serv_reply.value()) {
+        const ConnmanMapList connmanobjs = serv_reply.value();
+        for (const ConnmanMap &connmanobj : connmanobjs)
             servicesList << connmanobj.objectPath.path();
-        }
         Q_EMIT servicesReady(servicesList);
     }
     call->deleteLater();
@@ -181,7 +180,7 @@ void QConnmanManagerInterface::connectNotify(const QMetaMethod &signal)
 void QConnmanManagerInterface::onServicesChanged(const ConnmanMapList &changed, const QList<QDBusObjectPath> &removed)
 {
     servicesList.clear(); //connman list changes order
-    Q_FOREACH (const ConnmanMap &connmanobj, changed) {
+    for (const ConnmanMap &connmanobj : changed) {
         const QString svcPath(connmanobj.objectPath.path());
         servicesList << svcPath;
     }
@@ -225,7 +224,8 @@ QStringList QConnmanManagerInterface::getTechnologies()
         QDBusPendingReply<ConnmanMapList> reply = call(QLatin1String("GetTechnologies"));
         reply.waitForFinished();
         if (!reply.isError()) {
-            Q_FOREACH (const ConnmanMap &map, reply.value()) {
+            const ConnmanMapList maps = reply.value();
+            for (const ConnmanMap &map : maps) {
                 if (!technologiesMap.contains(map.objectPath.path())) {
                     technologyAdded(map.objectPath, map.propertyMap);
                 }
@@ -241,9 +241,9 @@ QStringList QConnmanManagerInterface::getServices()
         QDBusPendingReply<ConnmanMapList> reply = call(QLatin1String("GetServices"));
         reply.waitForFinished();
         if (!reply.isError()) {
-            Q_FOREACH (const ConnmanMap &map, reply.value()) {
+            const ConnmanMapList maps = reply.value();
+            for (const ConnmanMap &map : maps)
                 servicesList << map.objectPath.path();
-            }
         }
     }
     return servicesList;