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>

14 files changed, 37 insertions, 26 deletions

diff --git a/examples/assistant/simpletextviewer/findfiledialog.cpp b/examples/assistant/simpletextviewer/findfiledialog.cpp
index 3d2206e9a..b34b8aeae 100644
--- a/examples/assistant/simpletextviewer/findfiledialog.cpp
+++ b/examples/assistant/simpletextviewer/findfiledialog.cpp
@@ -134,10 +134,10 @@ void FindFileDialog::findFiles()
 
     QDir directory(directoryComboBox->currentText());
 
-    QStringList allFiles = directory.entryList(QDir::Files | QDir::NoSymLinks);
+    const QStringList allFiles = directory.entryList(QDir::Files | QDir::NoSymLinks);
     QStringList matchingFiles;
 
-    foreach (QString file, allFiles) {
+    for (const QString &file : allFiles) {
         if (filePattern.exactMatch(file))
             matchingFiles << file;
     }
diff --git a/src/kmap2qmap/main.cpp b/src/kmap2qmap/main.cpp
index 9fd7e9ae8..60d49ddca 100644
--- a/src/kmap2qmap/main.cpp
+++ b/src/kmap2qmap/main.cpp
@@ -603,7 +603,8 @@ bool KeymapParser::parseKmap(QFile *f)
             keymaps.clear();
 
             if (tokens.count() > 1) {
-                foreach (const QByteArray &section, tokens[1].split(',')) {
+                const QByteArrayList tokenList = tokens[1].split(',');
+                for (const QByteArray &section : tokenList) {
                     int dashpos = section.indexOf('-');
 
                     //qWarning("Section %s", section.constData());
@@ -645,7 +646,7 @@ bool KeymapParser::parseKmap(QFile *f)
                     searchpath << d;
                 searchpath << QDir::current();
 
-                foreach (const QDir &path, searchpath) {
+                for (const QDir &path : qAsConst(searchpath)) {
                     QFile f2(path.filePath(incname));
                     //qWarning("  -- trying to include %s", qPrintable(f2.fileName()));
                     if (f2.open(QIODevice::ReadOnly)) {
diff --git a/src/makeqpf/mainwindow.cpp b/src/makeqpf/mainwindow.cpp
index a6aebde5d..ce745e825 100644
--- a/src/makeqpf/mainwindow.cpp
+++ b/src/makeqpf/mainwindow.cpp
@@ -220,7 +220,7 @@ void MainWindow::on_sampleFile_editingFinished()
     QList<QChar> sortedCoverage = QList<QChar>::fromSet(coverage);
     qSort(sortedCoverage);
     // play simple :)
-    foreach (QChar ch, sortedCoverage) {
+    for (QChar ch : qAsConst(sortedCoverage)) {
         QPF::CharacterRange r;
         r.start = ch.unicode();
         r.end = r.start + 1;
diff --git a/src/makeqpf/qpf2.cpp b/src/makeqpf/qpf2.cpp
index 86a8c83d9..508afaa33 100644
--- a/src/makeqpf/qpf2.cpp
+++ b/src/makeqpf/qpf2.cpp
@@ -505,7 +505,7 @@ void QPF::addGlyphs(QFontEngine *fe, const QList<CharacterRange> &ranges)
 
         QGlyphLayoutArray<10> layout;
 
-        foreach (CharacterRange range, ranges) {
+        for (CharacterRange range : ranges) {
             if (debugVerbosity > 2)
                 qDebug() << "rendering range from" << range.start << "to" << range.end;
             for (uint uc = range.start; uc < range.end; ++uc) {
diff --git a/src/pixeltool/qpixeltool.cpp b/src/pixeltool/qpixeltool.cpp
index e02fa0eb8..6fcaefb85 100644
--- a/src/pixeltool/qpixeltool.cpp
+++ b/src/pixeltool/qpixeltool.cpp
@@ -544,7 +544,8 @@ void QPixelTool::saveToFile()
     fileDialog.setAcceptMode(QFileDialog::AcceptSave);
     fileDialog.setDirectory(QStandardPaths::writableLocation(QStandardPaths::PicturesLocation));
     QStringList mimeTypes;
-    foreach (const QByteArray &mimeTypeB, QImageWriter::supportedMimeTypes())
+    const QByteArrayList supportedMimeTypes = QImageWriter::supportedMimeTypes();
+    for (const QByteArray &mimeTypeB : supportedMimeTypes)
         mimeTypes.append(QString::fromLatin1(mimeTypeB));
     fileDialog.setMimeTypeFilters(mimeTypes);
     const QString pngType = QLatin1String("image/png");
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>]"));
diff --git a/src/qtattributionsscanner/jsongenerator.cpp b/src/qtattributionsscanner/jsongenerator.cpp
index d5b0249a5..37d0426af 100644
--- a/src/qtattributionsscanner/jsongenerator.cpp
+++ b/src/qtattributionsscanner/jsongenerator.cpp
@@ -69,7 +69,7 @@ void generate(QTextStream &out, const QVector<Package> &packages, LogLevel logLe
 
     QJsonDocument document;
     QJsonArray array;
-    foreach (const Package &package, packages)
+    for (const Package &package : packages)
         array.append(generate(package));
     document.setArray(array);
 
diff --git a/src/qtattributionsscanner/scanner.cpp b/src/qtattributionsscanner/scanner.cpp
index a405b2b03..7484d5df3 100644
--- a/src/qtattributionsscanner/scanner.cpp
+++ b/src/qtattributionsscanner/scanner.cpp
@@ -122,7 +122,7 @@ static Package readPackage(const QJsonObject &object, const QString &filePath, L
         if (p.qtParts.isEmpty())
             p.qtParts << QStringLiteral("libs");
 
-        foreach (const QString &part, p.qtParts) {
+        for (const QString &part : qAsConst(p.qtParts)) {
             if (part != QLatin1String("examples")
                     && part != QLatin1String("tests")
                     && part != QLatin1String("tools")
@@ -197,7 +197,8 @@ QVector<Package> scanDirectory(const QString &directory, LogLevel logLevel)
     dir.setNameFilters(QStringList() << QStringLiteral("qt_attribution.json"));
     dir.setFilter(QDir::AllDirs | QDir::NoDotAndDotDot | QDir::Files);
 
-    foreach (const QFileInfo &info, dir.entryInfoList()) {
+    const QFileInfoList entries = dir.entryInfoList();
+    for (const QFileInfo &info : entries) {
         if (info.isDir()) {
             packages += scanDirectory(info.filePath(), logLevel);
         } else {
diff --git a/src/qtdiag/qtdiag.cpp b/src/qtdiag/qtdiag.cpp
index d12dd691e..dcf7f8faa 100644
--- a/src/qtdiag/qtdiag.cpp
+++ b/src/qtdiag/qtdiag.cpp
@@ -174,7 +174,7 @@ void dumpGlInfo(QTextStream &str, bool listExtensions)
             QList<QByteArray> extensionList = context.extensions().toList();
             std::sort(extensionList.begin(), extensionList.end());
             str << " \nFound " << extensionList.size() << " extensions:\n";
-            foreach (const QByteArray &extension, extensionList)
+            for (const QByteArray &extension : qAsConst(extensionList))
                 str << "  " << extension << '\n';
         }
     } else {
@@ -347,7 +347,8 @@ QString qtDiag(unsigned flags)
 #ifndef QT_NO_PROCESS
     const QProcessEnvironment systemEnvironment = QProcessEnvironment::systemEnvironment();
     str << "\nEnvironment:\n";
-    foreach (const QString &key, systemEnvironment.keys()) {
+    const QStringList keys = systemEnvironment.keys();
+    for (const QString &key : keys) {
         if (key.startsWith(QLatin1Char('Q')))
            str << "  " << key << "=\"" << systemEnvironment.value(key) << "\"\n";
     }
@@ -396,7 +397,8 @@ QString qtDiag(unsigned flags)
     DUMP_STANDARDPATH(str, AppConfigLocation)
 
     str << "\nFile selectors (increasing order of precedence):\n ";
-    foreach (const QString &s, QFileSelector().allSelectors())
+    const QStringList allSelectors = QFileSelector().allSelectors();
+    for (const QString &s : allSelectors)
         str << ' ' << s;
 
     str << "\n\nNetwork:\n  ";
@@ -553,7 +555,7 @@ QString qtDiag(unsigned flags)
     const QList<const QTouchDevice *> touchDevices = QTouchDevice::devices();
     if (!touchDevices.isEmpty()) {
         str << "Touch devices: " << touchDevices.size() << '\n';
-        foreach (const QTouchDevice *device, touchDevices) {
+        for (const QTouchDevice *device : touchDevices) {
             str << "  " << (device->type() == QTouchDevice::TouchScreen ? "TouchScreen" : "TouchPad")
                 << " \"" << device->name() << "\", max " << device->maximumTouchPoints()
                 << " touch points, capabilities:";
diff --git a/src/qtplugininfo/qtplugininfo.cpp b/src/qtplugininfo/qtplugininfo.cpp
index f32ebad44..2c3db2afd 100644
--- a/src/qtplugininfo/qtplugininfo.cpp
+++ b/src/qtplugininfo/qtplugininfo.cpp
@@ -90,7 +90,8 @@ int main(int argc, char** argv)
         print |= PrintUserData;
 
     int retval = 0;
-    foreach (const QString &plugin, parser.positionalArguments()) {
+    const QStringList positionalArguments = parser.positionalArguments();
+    for (const QString &plugin : positionalArguments) {
         QByteArray pluginNativeName = QFile::encodeName(QDir::toNativeSeparators(plugin));
         if (!QFile::exists(plugin)) {
             std::cerr << "qtplugininfo: " << pluginNativeName.constData() << ": No such file or directory." << std::endl;
diff --git a/src/winrtrunner/appxengine.cpp b/src/winrtrunner/appxengine.cpp
index d8322d1ca..9272a27ab 100644
--- a/src/winrtrunner/appxengine.cpp
+++ b/src/winrtrunner/appxengine.cpp
@@ -542,7 +542,7 @@ bool AppxEngine::installDependencies()
     qCDebug(lcWinRtRunner) << __FUNCTION__;
 
     QSet<QString> toInstall;
-    foreach (const QString &dependencyName, d->dependencies) {
+    for (const QString &dependencyName : qAsConst(d->dependencies)) {
         toInstall.insert(dependencyName);
         qCDebug(lcWinRtRunner).nospace()
             << "dependency to be installed: " << dependencyName;
diff --git a/src/winrtrunner/appxphoneengine.cpp b/src/winrtrunner/appxphoneengine.cpp
index fb78e350b..9cb2e0b1e 100644
--- a/src/winrtrunner/appxphoneengine.cpp
+++ b/src/winrtrunner/appxphoneengine.cpp
@@ -210,7 +210,9 @@ RunnerEngine *AppxPhoneEngine::create(Runner *runner)
 QStringList AppxPhoneEngine::deviceNames()
 {
     QStringList deviceNames;
-    foreach (const CoreConDevice *device, coreConServer->devices())
+
+    const QList<CoreConDevice *> devices = coreConServer->devices();
+    for (const CoreConDevice *device : devices)
         deviceNames.append(device->name());
     return deviceNames;
 }
diff --git a/src/winrtrunner/main.cpp b/src/winrtrunner/main.cpp
index 296d44ec6..e41bfb697 100644
--- a/src/winrtrunner/main.cpp
+++ b/src/winrtrunner/main.cpp
@@ -176,10 +176,10 @@ int main(int argc, char *argv[])
     if (parser.isSet(listDevicesOption)) {
         std::wcout << "Available devices:\n";
         const QMap<QString, QStringList> deviceNames = Runner::deviceNames();
-        foreach (const QString &profile, deviceNames.keys()) {
-            std::wcout << reinterpret_cast<const wchar_t *>(profile.utf16()) << ":\n";
+        for (auto it = deviceNames.cbegin(), end = deviceNames.cend(); it != end; ++it) {
+            std::wcout << reinterpret_cast<const wchar_t *>(it.key().utf16()) << ":\n";
             int index = 0;
-            foreach (const QString &device, deviceNames.value(profile)) {
+            for (const QString &device : it.value()) {
                 std::wcout << "  " << index++ << ' '
                            << reinterpret_cast<const wchar_t *>(device.utf16()) << '\n';
             }