Replace foreach with ranged for and set QT_NO_FOREACH

Make containers const where they obviously should be, iterate over
references where it's clearly possible.

Cherry-pick of 2c8c5dca44aba5612cc67b04dd3c7e5fc4919b19.

Change-Id: Ie55a58873b48bbb60ac49790db612f85777e6ceb
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

1 files changed, 6 insertions, 9 deletions

diff --git a/tests/auto/geotestplugin/qplacemanagerengine_test.h b/tests/auto/geotestplugin/qplacemanagerengine_test.h
index 45f52a2c..5f35fb37 100644
--- a/tests/auto/geotestplugin/qplacemanagerengine_test.h
+++ b/tests/auto/geotestplugin/qplacemanagerengine_test.h
@@ -463,7 +463,7 @@ public:
         QList<QPlaceSearchResult> results;
 
         if (!query.searchTerm().isEmpty()) {
-            foreach (const QPlace &place, m_places) {
+            for (const QPlace &place : m_places) {
                 if (!place.name().contains(query.searchTerm(), Qt::CaseInsensitive))
                     continue;
 
@@ -489,8 +489,8 @@ public:
                 results.append(r);
             }
         } else if (!query.recommendationId().isEmpty()) {
-            QStringList recommendations = m_placeRecommendations.value(query.recommendationId());
-            foreach (const QString &id, recommendations) {
+            const QStringList recommendations = m_placeRecommendations.value(query.recommendationId());
+            for (const QString &id : recommendations) {
                 QPlaceResult r;
                 r.setPlace(m_places.value(id));
                 r.setTitle(r.place().name());
@@ -653,7 +653,7 @@ public:
     {
         QList<QPlaceCategory> categories;
 
-        foreach (const QString &id, m_childCategories.value(parentId))
+        for (const QString &id : m_childCategories.value(parentId))
             categories.append(m_categories.value(id));
 
         return categories;
@@ -678,11 +678,8 @@ public:
         sizeDictionary.insert(QStringLiteral("m"), 30);
         sizeDictionary.insert(QStringLiteral("l"), 50);
 
-        QStringList sizeKeys;
-        sizeKeys << QStringLiteral("s") << QStringLiteral("m") << QStringLiteral("l");
-
-        foreach (const QString &sizeKey, sizeKeys)
-        {
+        const QStringList sizeKeys = { QStringLiteral("s"), QStringLiteral("m"), QStringLiteral("l") };
+        for (const QString &sizeKey : sizeKeys) {
             if (icon.parameters().contains(sizeKey))
                 candidates.append(QPair<int, QUrl>(sizeDictionary.value(sizeKey),
                                   icon.parameters().value(sizeKey).toUrl()));