foreach cleanup in the the smaller tools

Replace foreach by C++ 11 range based for in
kmap2qmap, makeqpf, pixeltool, qdbus, qtattributionsscanner,
qtdiag, qtplugininfo, winrtrunner and the simpletextviewer example.

Change-Id: I079da84c47a1584526f4fe188377c0262419a44d
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

2 files changed, 9 insertions, 6 deletions

diff --git a/src/qdbus/qdbus/qdbus.cpp b/src/qdbus/qdbus/qdbus.cpp
index 76310d0d7..225c619f9 100644
--- a/src/qdbus/qdbus/qdbus.cpp
+++ b/src/qdbus/qdbus/qdbus.cpp
@@ -77,10 +77,12 @@ static void printArg(const QVariant &v)
     }
 
     if (v.userType() == QVariant::StringList) {
-        foreach (QString s, v.toStringList())
+        const QStringList sl = v.toStringList();
+        for (const QString &s : sl)
             printf("%s\n", qPrintable(s));
     } else if (v.userType() == QVariant::List) {
-        foreach (const QVariant &var, v.toList())
+        const QVariantList vl = v.toList();
+        for (const QVariant &var : vl)
             printArg(var);
     } else if (v.userType() == QVariant::Map) {
         const QVariantMap map = v.toMap();
@@ -394,7 +396,8 @@ static int placeCall(const QString &service, const QString &path, const QString
         return 1;
     }
 
-    foreach (QVariant v, reply.arguments())
+    const QVariantList replyArguments = reply.arguments();
+    for (const QVariant &v : replyArguments)
         printArg(v);
 
     return 0;
@@ -408,7 +411,7 @@ static bool globServices(QDBusConnectionInterface *bus, const QString &glob)
 
     QStringList names = bus->registeredServiceNames();
     names.sort();
-    foreach (const QString &name, names)
+    for (const QString &name : qAsConst(names))
         if (pattern.exactMatch(name))
             printf("%s\n", qPrintable(name));
 
@@ -420,7 +423,7 @@ static void printAllServices(QDBusConnectionInterface *bus)
     const QStringList services = bus->registeredServiceNames();
     QMap<QString, QStringList> servicesWithAliases;
 
-    foreach (QString serviceName, services) {
+    for (const QString &serviceName : services) {
         QDBusReply<QString> reply = bus->serviceOwner(serviceName);
         QString owner = reply;
         if (owner.isEmpty())
diff --git a/src/qdbus/qdbusviewer/qdbusviewer.cpp b/src/qdbus/qdbusviewer/qdbusviewer.cpp
index bdd2ea522..00de97891 100644
--- a/src/qdbus/qdbusviewer/qdbusviewer.cpp
+++ b/src/qdbus/qdbusviewer/qdbusviewer.cpp
@@ -436,7 +436,7 @@ void QDBusViewer::dumpMessage(const QDBusMessage &message)
         out += QLatin1String("&nbsp;&nbsp;(no arguments)");
     } else {
         out += QLatin1String("&nbsp;&nbsp;Arguments: ");
-        foreach (QVariant arg, args) {
+        for (const QVariant &arg : qAsConst(args)) {
             QString str = QDBusUtil::argumentToString(arg).toHtmlEscaped();
             // turn object paths into clickable links
             str.replace(objectPathRegExp, QLatin1String("[ObjectPath: <a href=\"qdbus://bus\\1\">\\1</a>]"));