dbusmenu: eradicate Q_FOREACH loops

... by replacing them with C++11 range-for loops.

Saves ~1.7KiB in text size across all plugins and libs
(statically) linking in QtPlatformSupport (optimized
GCC 6.1 Linux AMD 64 build).

Change-Id: I492bf2d6afe9bccdc1237003388fcb83a2261dba
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

3 files changed, 8 insertions, 7 deletions

diff --git a/src/platformsupport/dbusmenu/qdbusmenuadaptor.cpp b/src/platformsupport/dbusmenu/qdbusmenuadaptor.cpp
index f6a5144e2b..354b9c3a2e 100644
--- a/src/platformsupport/dbusmenu/qdbusmenuadaptor.cpp
+++ b/src/platformsupport/dbusmenu/qdbusmenuadaptor.cpp
@@ -105,7 +105,7 @@ QList<int> QDBusMenuAdaptor::AboutToShowGroup(const QList<int> &ids, QList<int>
     qCDebug(qLcMenu) << ids;
     Q_UNUSED(idErrors)
     idErrors.clear();
-    Q_FOREACH (int id, ids)
+    for (int id : ids)
         AboutToShow(id);
     return QList<int>(); // updatesNeeded
 }
@@ -134,7 +134,7 @@ void QDBusMenuAdaptor::Event(int id, const QString &eventId, const QDBusVariant
 
 QList<int> QDBusMenuAdaptor::EventGroup(const QDBusMenuEventList &events)
 {
-    Q_FOREACH (const QDBusMenuEvent &ev, events)
+    for (const QDBusMenuEvent &ev : events)
         Event(ev.m_id, ev.m_eventId, ev.m_data, ev.m_timestamp);
     return QList<int>(); // idErrors
 }
diff --git a/src/platformsupport/dbusmenu/qdbusmenutypes.cpp b/src/platformsupport/dbusmenu/qdbusmenutypes.cpp
index 3b420924de..82a13d2fa0 100644
--- a/src/platformsupport/dbusmenu/qdbusmenutypes.cpp
+++ b/src/platformsupport/dbusmenu/qdbusmenutypes.cpp
@@ -113,7 +113,8 @@ uint QDBusMenuLayoutItem::populate(int id, int depth, const QStringList &propert
 
 void QDBusMenuLayoutItem::populate(const QDBusPlatformMenu *menu, int depth, const QStringList &propertyNames)
 {
-    Q_FOREACH (QDBusPlatformMenuItem *item, menu->items()) {
+    const auto items = menu->items();
+    for (QDBusPlatformMenuItem *item : items) {
         QDBusMenuLayoutItem child;
         child.populate(item, depth - 1, propertyNames);
         m_children << child;
@@ -136,7 +137,7 @@ const QDBusArgument &operator<<(QDBusArgument &arg, const QDBusMenuLayoutItem &i
     arg.beginStructure();
     arg << item.m_id << item.m_properties;
     arg.beginArray(qMetaTypeId<QDBusVariant>());
-    foreach (const QDBusMenuLayoutItem& child, item.m_children)
+    for (const QDBusMenuLayoutItem &child : item.m_children)
         arg << QDBusVariant(QVariant::fromValue<QDBusMenuLayoutItem>(child));
     arg.endArray();
     arg.endStructure();
@@ -213,9 +214,9 @@ QDBusMenuItemList QDBusMenuItem::items(const QList<int> &ids, const QStringList
 {
     Q_UNUSED(propertyNames)
     QDBusMenuItemList ret;
-    QList<const QDBusPlatformMenuItem *> items = QDBusPlatformMenuItem::byIds(ids);
+    const QList<const QDBusPlatformMenuItem *> items = QDBusPlatformMenuItem::byIds(ids);
     ret.reserve(items.size());
-    Q_FOREACH (const QDBusPlatformMenuItem *item, items)
+    for (const QDBusPlatformMenuItem *item : items)
         ret << QDBusMenuItem(item);
     return ret;
 }
diff --git a/src/platformsupport/dbusmenu/qdbusplatformmenu.cpp b/src/platformsupport/dbusmenu/qdbusplatformmenu.cpp
index e220f70c11..993571eb13 100644
--- a/src/platformsupport/dbusmenu/qdbusplatformmenu.cpp
+++ b/src/platformsupport/dbusmenu/qdbusplatformmenu.cpp
@@ -156,7 +156,7 @@ QDBusPlatformMenuItem *QDBusPlatformMenuItem::byId(int id)
 QList<const QDBusPlatformMenuItem *> QDBusPlatformMenuItem::byIds(const QList<int> &ids)
 {
     QList<const QDBusPlatformMenuItem *> ret;
-    Q_FOREACH (int id, ids) {
+    for (int id : ids) {
         if (menuItemsByID.contains(id))
             ret << menuItemsByID[id];
     }