diff options
author | Jüri Valdmann <juri.valdmann@qt.io> | 2018-06-04 12:08:57 +0200 |
---|---|---|
committer | Jüri Valdmann <juri.valdmann@qt.io> | 2018-06-06 06:10:38 +0000 |
commit | 542c5b698cb9586aac48cc4dda66a6a2f98c905e (patch) | |
tree | edfdde1de98e132e6cb7bf4445638ed8f7ce8f3a /src/webenginewidgets | |
parent | 6cd3360c4d5283893eeb1efe43e329073709b48c (diff) |
Use range-based for instead of Q_FOREACH
Change-Id: Ibf016b795ff98fddfa29fb5dc63924a2d2159d71
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/webenginewidgets')
3 files changed, 6 insertions, 6 deletions
diff --git a/src/webenginewidgets/api/qwebengineprofile.cpp b/src/webenginewidgets/api/qwebengineprofile.cpp index 96e47a75d..bec5455cb 100644 --- a/src/webenginewidgets/api/qwebengineprofile.cpp +++ b/src/webenginewidgets/api/qwebengineprofile.cpp @@ -166,7 +166,7 @@ QWebEngineProfilePrivate::~QWebEngineProfilePrivate() m_browserContextAdapter->removeClient(this); } - Q_FOREACH (QWebEngineDownloadItem* download, m_ongoingDownloads) { + for (QWebEngineDownloadItem *download : qAsConst(m_ongoingDownloads)) { if (download) download->cancel(); } diff --git a/src/webenginewidgets/api/qwebenginescriptcollection.cpp b/src/webenginewidgets/api/qwebenginescriptcollection.cpp index bcf0c127c..5ef0ffd44 100644 --- a/src/webenginewidgets/api/qwebenginescriptcollection.cpp +++ b/src/webenginewidgets/api/qwebenginescriptcollection.cpp @@ -135,7 +135,7 @@ void QWebEngineScriptCollection::insert(const QWebEngineScript &s) void QWebEngineScriptCollection::insert(const QList<QWebEngineScript> &list) { d->reserve(list.size()); - Q_FOREACH (const QWebEngineScript &s, list) + for (const QWebEngineScript &s : list) d->insert(s); } @@ -207,7 +207,7 @@ QList<QWebEngineScript> QWebEngineScriptCollectionPrivate::toList(const QString return m_scripts; QList<QWebEngineScript> ret; - Q_FOREACH (const QWebEngineScript &script, m_scripts) + for (const QWebEngineScript &script : qAsConst(m_scripts)) if (scriptName == script.name()) ret.append(script); return ret; @@ -215,7 +215,7 @@ QList<QWebEngineScript> QWebEngineScriptCollectionPrivate::toList(const QString QWebEngineScript QWebEngineScriptCollectionPrivate::find(const QString &name) const { - Q_FOREACH (const QWebEngineScript &script, m_scripts) + for (const QWebEngineScript &script : qAsConst(m_scripts)) if (name == script.name()) return script; return QWebEngineScript(); @@ -240,7 +240,7 @@ void QWebEngineScriptCollectionPrivate::initializationFinished(QSharedPointer<Qt Q_ASSERT(m_contents); Q_ASSERT(contents); - Q_FOREACH (const QWebEngineScript &script, m_scripts) + for (const QWebEngineScript &script : qAsConst(m_scripts)) m_scriptController->addUserScript(*script.d, contents.data()); m_contents = contents; } diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp index 6b57eac78..81cf2e0e5 100644 --- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp +++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp @@ -397,7 +397,7 @@ void RenderWidgetHostViewQtDelegateWidget::showEvent(QShowEvent *event) // We don't have a way to catch a top-level window change with QWidget // but a widget will most likely be shown again if it changes, so do // the reconnection at this point. - foreach (const QMetaObject::Connection &c, m_windowConnections) + for (const QMetaObject::Connection &c : qAsConst(m_windowConnections)) disconnect(c); m_windowConnections.clear(); if (QWindow *w = window()) { |