Use range-based for instead of Q_FOREACH

Change-Id: Ibf016b795ff98fddfa29fb5dc63924a2d2159d71
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

4 files changed, 14 insertions, 10 deletions

diff --git a/src/webengine/api/qquickwebengineprofile.cpp b/src/webengine/api/qquickwebengineprofile.cpp
index 3c22dba98..6c7985e3f 100644
--- a/src/webengine/api/qquickwebengineprofile.cpp
+++ b/src/webengine/api/qquickwebengineprofile.cpp
@@ -167,7 +167,7 @@ QQuickWebEngineProfilePrivate::~QQuickWebEngineProfilePrivate()
         m_browserContextAdapter->removeClient(this);
     }
 
-    Q_FOREACH (QQuickWebEngineDownloadItem *download, m_ongoingDownloads) {
+    for (QQuickWebEngineDownloadItem *download : qAsConst(m_ongoingDownloads)) {
         if (download)
             download->cancel();
     }
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 32df81538..ba7377c2c 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -768,7 +768,7 @@ void QQuickWebEngineViewPrivate::initializationFinished()
     if (devToolsView && devToolsView->d_ptr->adapter)
         adapter->openDevToolsFrontend(devToolsView->d_ptr->adapter);
 
-    Q_FOREACH (QQuickWebEngineScript *script, m_userScripts)
+    for (QQuickWebEngineScript *script : qAsConst(m_userScripts))
         script->d_func()->bind(browserContextAdapter()->userResourceController(), adapter.data());
 
     if (!m_isBeingAdopted)
@@ -1371,7 +1371,8 @@ void QQuickWebEngineView::fullScreenCancelled()
 void QQuickWebEngineView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     QQuickItem::geometryChanged(newGeometry, oldGeometry);
-    Q_FOREACH(QQuickItem *child, childItems()) {
+    const QList<QQuickItem *> children = childItems();
+    for (QQuickItem *child : children) {
         if (qobject_cast<RenderWidgetHostViewQtDelegateQuick *>(child))
             child->setSize(newGeometry.size());
     }
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
index 0a31811d9..080a37eeb 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -351,7 +351,7 @@ void RenderWidgetHostViewQtDelegateQuick::itemChange(ItemChange change, const It
 {
     QQuickItem::itemChange(change, value);
     if (change == QQuickItem::ItemSceneChange) {
-        foreach (const QMetaObject::Connection &c, m_windowConnections)
+        for (const QMetaObject::Connection &c : qAsConst(m_windowConnections))
             disconnect(c);
         m_windowConnections.clear();
         if (value.window) {
diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webengine/ui_delegates_manager.cpp
index 573d5018b..5d5e89144 100644
--- a/src/webengine/ui_delegates_manager.cpp
+++ b/src/webengine/ui_delegates_manager.cpp
@@ -84,8 +84,8 @@ static QString fileNameForComponent(UIDelegatesManager::ComponentType type)
 
 static QPoint calculateToolTipPosition(QPoint &position, QSize &toolTip) {
     QRect screen;
-    QList<QScreen *> screens = QGuiApplication::screens();
-    Q_FOREACH (const QScreen *src, screens)
+    const QList<QScreen *> screens = QGuiApplication::screens();
+    for (const QScreen *src : screens)
         if (src->availableGeometry().contains(position))
             screen = src->availableGeometry();
 
@@ -144,7 +144,8 @@ UIDelegatesManager::~UIDelegatesManager()
         break;
 
 bool UIDelegatesManager::initializeImportDirs(QStringList &dirs, QQmlEngine *engine) {
-    foreach (const QString &path, engine->importPathList()) {
+    const QStringList paths = engine->importPathList();
+    for (const QString &path : paths) {
         QFileInfo fi(path % QLatin1String("/QtWebEngine/Controls1Delegates/"));
         if (fi.exists()) {
             dirs << fi.absolutePath();
@@ -177,7 +178,7 @@ bool UIDelegatesManager::ensureComponentLoaded(ComponentType type)
     if (!engine)
         return false;
 
-    foreach (const QString &importDir, m_importDirs) {
+    for (const QString &importDir : qAsConst(m_importDirs)) {
         QFileInfo fi(importDir % QLatin1Char('/') % fileName);
         if (!fi.exists())
             continue;
@@ -186,7 +187,8 @@ bool UIDelegatesManager::ensureComponentLoaded(ComponentType type)
                                         QQmlComponent::PreferSynchronous, m_view));
 
         if ((*component)->status() != QQmlComponent::Ready) {
-            foreach (const QQmlError &err, (*component)->errors())
+            const QList<QQmlError> errs = (*component)->errors();
+            for (const QQmlError &err : errs)
                 qWarning("QtWebEngine: component error: %s\n", qPrintable(err.toString()));
             delete *component;
             *component = nullptr;
@@ -575,7 +577,8 @@ UI2DelegatesManager::UI2DelegatesManager(QQuickWebEngineView *view) : UIDelegate
 
 bool UI2DelegatesManager::initializeImportDirs(QStringList &dirs, QQmlEngine *engine)
 {
-    foreach (const QString &path, engine->importPathList()) {
+    const QStringList paths = engine->importPathList();
+    for (const QString &path : paths) {
         QFileInfo fi1(path % QLatin1String("/QtWebEngine/Controls1Delegates/"));
         QFileInfo fi2(path % QLatin1String("/QtWebEngine/Controls2Delegates/"));
         if (fi1.exists() && fi2.exists()) {