From 928885a5c027f161596f62b69d42a0f07c3ccb3e Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Thu, 10 Aug 2023 01:41:15 +0300 Subject: [PATCH] QMdiArea: port Q_FOREACH to ranged-for: loop doesn't change container The container is childWindows in all cases: - place(): queries the windows' geometries - setChildActivationEnabled(): sets a bool member in subwindow->d - subWindowList(): {pre,ap}pends windows pointers to a separate QList Task-number: QTBUG-115803 Change-Id: I0fdd5f22f29f085b71bf46f68bf9ec04c45c9317 Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 79dc2980e69d1b568c3c80e30a3bd0af21548f22) Reviewed-by: Qt Cherry-pick Bot --- src/widgets/widgets/qmdiarea.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp index 93de95547e7..e1b9649e5af 100644 --- a/src/widgets/widgets/qmdiarea.cpp +++ b/src/widgets/widgets/qmdiarea.cpp @@ -846,7 +846,7 @@ void QMdiAreaPrivate::place(Placer *placer, QMdiSubWindow *child) QList rects; rects.reserve(childWindows.size()); QRect parentRect = q->rect(); - foreach (QMdiSubWindow *window, childWindows) { + for (QMdiSubWindow *window : std::as_const(childWindows)) { if (!sanityCheck(window, "QMdiArea::place") || window == child || !window->isVisibleTo(q) || !window->testAttribute(Qt::WA_Moved)) { continue; @@ -1302,7 +1302,7 @@ bool QMdiAreaPrivate::lastWindowAboutToBeDestroyed() const */ void QMdiAreaPrivate::setChildActivationEnabled(bool enable, bool onlyNextActivationEvent) const { - foreach (QMdiSubWindow *subWindow, childWindows) { + for (QMdiSubWindow *subWindow : childWindows) { if (!subWindow || !subWindow->isVisible()) continue; if (onlyNextActivationEvent) @@ -1340,7 +1340,7 @@ QMdiAreaPrivate::subWindowList(QMdiArea::WindowOrder order, bool reversed) const return list; if (order == QMdiArea::CreationOrder) { - foreach (QMdiSubWindow *child, childWindows) { + for (QMdiSubWindow *child : childWindows) { if (!child) continue; if (!reversed)