8 files changed, 14 insertions, 10 deletions
diff --git a/src/client/qwaylanddatasource.cpp b/src/client/qwaylanddatasource.cpp
index 0c6ad50e4..ea76943a7 100644
--- a/src/client/qwaylanddatasource.cpp
+++ b/src/client/qwaylanddatasource.cpp
@@ -60,7 +60,8 @@ QWaylandDataSource::QWaylandDataSource(QWaylandDataDeviceManager *dataDeviceMana
 {
     if (!mimeData)
         return;
-    Q_FOREACH (const QString &format, mimeData->formats()) {
+    const auto formats = mimeData->formats();
+    for (const QString &format : formats) {
         offer(format);
     }
 }
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp
index d0f981702..41bdf6b05 100644
--- a/src/client/qwaylanddisplay.cpp
+++ b/src/client/qwaylanddisplay.cpp
@@ -366,7 +366,7 @@ void QWaylandDisplay::registry_global_remove(uint32_t id)
                     }
                 }
 
-                foreach (QWaylandScreen *screen, mScreens) {
+                for (QWaylandScreen *screen : qAsConst(mScreens)) {
                     if (screen->outputId() == id) {
                         mScreens.removeOne(screen);
                         QWindowSystemInterface::handleScreenRemoved(screen);
diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp
index 1d34f06cc..068c058e7 100644
--- a/src/client/qwaylandinputcontext.cpp
+++ b/src/client/qwaylandinputcontext.cpp
@@ -221,11 +221,11 @@ void QWaylandTextInput::zwp_text_input_v2_leave(uint32_t serial, ::wl_surface *s
 
 void QWaylandTextInput::zwp_text_input_v2_modifiers_map(wl_array *map)
 {
-    QList<QByteArray> modifiersMap = QByteArray::fromRawData(static_cast<const char*>(map->data), map->size).split('\0');
+    const QList<QByteArray> modifiersMap = QByteArray::fromRawData(static_cast<const char*>(map->data), map->size).split('\0');
 
     m_modifiersMap.clear();
 
-    Q_FOREACH (const QByteArray &modifier, modifiersMap) {
+    for (const QByteArray &modifier : modifiersMap) {
         if (modifier == "Shift")
             m_modifiersMap.append(Qt::ShiftModifier);
         else if (modifier == "Control")
diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
index 8a580898d..6ebc3bed7 100644
--- a/src/client/qwaylandinputdevice.cpp
+++ b/src/client/qwaylandinputdevice.cpp
@@ -1349,7 +1349,7 @@ bool QWaylandInputDevice::Touch::allTouchPointsReleased()
 
 void QWaylandInputDevice::Touch::releasePoints()
 {
-    Q_FOREACH (const QWindowSystemInterface::TouchPoint &previousPoint, mPrevTouchPoints) {
+    for (const QWindowSystemInterface::TouchPoint &previousPoint : qAsConst(mPrevTouchPoints)) {
         QWindowSystemInterface::TouchPoint tp = previousPoint;
         tp.state = Qt::TouchPointReleased;
         mTouchPoints.append(tp);
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
index ea2b50b4a..e75aebd9e 100644
--- a/src/client/qwaylandintegration.cpp
+++ b/src/client/qwaylandintegration.cpp
@@ -421,7 +421,7 @@ void QWaylandIntegration::initializeShellIntegration()
         preferredShells << QLatin1String("wl-shell") << QLatin1String("ivi-shell");
     }
 
-    Q_FOREACH (QString preferredShell, preferredShells) {
+    for (const QString &preferredShell : qAsConst(preferredShells)) {
         mShellIntegration.reset(createShellIntegration(preferredShell));
         if (mShellIntegration) {
             qCDebug(lcQpaWayland, "Using the '%s' shell integration", qPrintable(preferredShell));
diff --git a/src/client/qwaylandscreen.cpp b/src/client/qwaylandscreen.cpp
index d116a807b..e70796832 100644
--- a/src/client/qwaylandscreen.cpp
+++ b/src/client/qwaylandscreen.cpp
@@ -175,7 +175,8 @@ QList<QPlatformScreen *> QWaylandScreen::virtualSiblings() const
 
 void QWaylandScreen::setOrientationUpdateMask(Qt::ScreenOrientations mask)
 {
-    foreach (QWindow *window, QGuiApplication::allWindows()) {
+    const auto allWindows = QGuiApplication::allWindows();
+    for (QWindow *window : allWindows) {
         QWaylandWindow *w = static_cast<QWaylandWindow *>(window->handle());
         if (w && w->waylandScreen() == this)
             w->setOrientationMask(mask);
diff --git a/src/client/qwaylandshmbackingstore.cpp b/src/client/qwaylandshmbackingstore.cpp
index c16d346eb..d768e7fc2 100644
--- a/src/client/qwaylandshmbackingstore.cpp
+++ b/src/client/qwaylandshmbackingstore.cpp
@@ -243,7 +243,8 @@ void QWaylandShmBackingStore::resize(const QSize &size, const QRegion &)
 
 QWaylandShmBuffer *QWaylandShmBackingStore::getBuffer(const QSize &size)
 {
-    foreach (QWaylandShmBuffer *b, mBuffers) {
+    const auto copy = mBuffers; // remove when ported to vector<unique_ptr> + remove_if
+    for (QWaylandShmBuffer *b : copy) {
         if (!b->busy()) {
             if (b->size() == size) {
                 return b;
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index 9bc400f8a..c3bfdeaff 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -94,7 +94,8 @@ QWaylandWindow::~QWaylandWindow()
         reset(false);
 
     const QWindow *parent = window();
-    foreach (QWindow *w, QGuiApplication::topLevelWindows()) {
+    const auto tlw = QGuiApplication::topLevelWindows();
+    for (QWindow *w : tlw) {
         if (w->transientParent() == parent)
             QWindowSystemInterface::handleCloseEvent(w);
     }
@@ -786,7 +787,7 @@ bool QWaylandWindow::createDecoration()
     }
 
     if (hadDecoration != (bool)mWindowDecoration) {
-        foreach (QWaylandSubSurface *subsurf, mChildren) {
+        for (QWaylandSubSurface *subsurf : qAsConst(mChildren)) {
             QPoint pos = subsurf->window()->geometry().topLeft();
             QMargins m = frameMargins();
             subsurf->set_position(pos.x() + m.left(), pos.y() + m.top());