diff options
29 files changed, 95 insertions, 78 deletions
diff --git a/examples/webengine/quicknanobrowser/main.cpp b/examples/webengine/quicknanobrowser/main.cpp index 94d6f8519..b1b80106b 100644 --- a/examples/webengine/quicknanobrowser/main.cpp +++ b/examples/webengine/quicknanobrowser/main.cpp @@ -66,7 +66,7 @@ static QUrl startupUrl() QUrl ret; QStringList args(qApp->arguments()); args.takeFirst(); - Q_FOREACH (const QString& arg, args) { + for (const QString &arg : qAsConst(args)) { if (arg.startsWith(QLatin1Char('-'))) continue; ret = Utils::fromUserInput(arg); diff --git a/examples/webenginewidgets/spellchecker/webview.cpp b/examples/webenginewidgets/spellchecker/webview.cpp index 833d8106e..a65fb1a1a 100644 --- a/examples/webenginewidgets/spellchecker/webview.cpp +++ b/examples/webenginewidgets/spellchecker/webview.cpp @@ -89,7 +89,8 @@ void WebView::contextMenuEvent(QContextMenuEvent *event) if (profile->isSpellCheckEnabled()) { QMenu *subMenu = menu->addMenu(tr("Select Language")); - foreach (const QString &str, m_spellCheckLanguages.keys()) { + const QStringList keys = m_spellCheckLanguages.keys(); + for (const QString &str : keys) { QAction *action = subMenu->addAction(str); action->setCheckable(true); QString lang = m_spellCheckLanguages[str]; diff --git a/src/core/api/qwebenginecookiestore.cpp b/src/core/api/qwebenginecookiestore.cpp index 5fcd46064..21610e334 100644 --- a/src/core/api/qwebenginecookiestore.cpp +++ b/src/core/api/qwebenginecookiestore.cpp @@ -94,7 +94,7 @@ void QWebEngineCookieStorePrivate::processPendingUserCookies() if (m_pendingUserCookies.isEmpty()) return; - Q_FOREACH (const auto &cookieData, m_pendingUserCookies) { + for (const CookieData &cookieData : qAsConst(m_pendingUserCookies)) { if (cookieData.callbackId == CallbackDirectory::DeleteCookieCallbackId) delegate->deleteCookie(cookieData.cookie, cookieData.origin); else diff --git a/src/core/browser_context_adapter.cpp b/src/core/browser_context_adapter.cpp index 2aeb8c5bf..4715451f2 100644 --- a/src/core/browser_context_adapter.cpp +++ b/src/core/browser_context_adapter.cpp @@ -293,7 +293,7 @@ void BrowserContextAdapter::setHttpUserAgent(const QString &userAgent) m_httpUserAgent = userAgent.simplified(); std::vector<content::WebContentsImpl *> list = content::WebContentsImpl::GetAllWebContents(); - Q_FOREACH (content::WebContentsImpl *web_contents, list) + for (content::WebContentsImpl *web_contents : list) if (web_contents->GetBrowserContext() == m_browserContext.data()) web_contents->SetUserAgentOverride(m_httpUserAgent.toStdString()); @@ -466,7 +466,7 @@ QString BrowserContextAdapter::httpAcceptLanguageWithoutQualities() const { const QStringList list = m_httpAcceptLanguage.split(QLatin1Char(',')); QString out; - Q_FOREACH (const QString& str, list) { + for (const QString &str : list) { if (!out.isEmpty()) out.append(QLatin1Char(',')); out.append(str.split(QLatin1Char(';')).first()); @@ -486,7 +486,7 @@ void BrowserContextAdapter::setHttpAcceptLanguage(const QString &httpAcceptLangu m_httpAcceptLanguage = httpAcceptLanguage; std::vector<content::WebContentsImpl *> list = content::WebContentsImpl::GetAllWebContents(); - Q_FOREACH (content::WebContentsImpl *web_contents, list) { + for (content::WebContentsImpl *web_contents : list) { if (web_contents->GetBrowserContext() == m_browserContext.data()) { content::RendererPreferences* rendererPrefs = web_contents->GetMutableRendererPrefs(); rendererPrefs->accept_languages = httpAcceptLanguageWithoutQualities().toStdString(); diff --git a/src/core/clipboard_qt.cpp b/src/core/clipboard_qt.cpp index cff975e61..44756bdfe 100644 --- a/src/core/clipboard_qt.cpp +++ b/src/core/clipboard_qt.cpp @@ -296,7 +296,8 @@ void ClipboardQt::ReadAvailableTypes(ui::ClipboardType type, std::vector<base::s return; if (mimeData->hasImage() && !mimeData->formats().contains(QStringLiteral("image/png"))) types->push_back(toString16(QStringLiteral("image/png"))); - Q_FOREACH (const QString &mimeType, mimeData->formats()) + const QStringList formats = mimeData->formats(); + for (const QString &mimeType : formats) types->push_back(toString16(mimeType)); *contains_filenames = false; diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp index 37b601bf8..584d6c0aa 100644 --- a/src/core/content_client_qt.cpp +++ b/src/core/content_client_qt.cpp @@ -165,7 +165,8 @@ void AddPepperFlashFromSystem(std::vector<content::PepperPluginInfo>* plugins) winDir = QString::fromLatin1("C:/Windows"); QDir pluginDir(winDir + "/System32/Macromed/Flash"); pluginDir.setFilter(QDir::Files); - Q_FOREACH (const QFileInfo &info, pluginDir.entryInfoList(QStringList("pepflashplayer*.dll"))) + const QFileInfoList infos = pluginDir.entryInfoList(QStringList("pepflashplayer*.dll")); + for (const QFileInfo &info : infos) pluginPaths << info.absoluteFilePath(); pluginPaths << ppapiPluginsPath() + QStringLiteral("/pepflashplayer.dll"); #endif @@ -248,7 +249,7 @@ void AddPepperWidevine(std::vector<content::PepperPluginInfo>* plugins) #endif } - Q_FOREACH (const QString &pluginPath, pluginPaths) { + for (const QString &pluginPath : qAsConst(pluginPaths)) { base::FilePath path = QtWebEngineCore::toFilePath(pluginPath); if (base::PathExists(path)) { content::PepperPluginInfo widevine_cdm; diff --git a/src/core/delegated_frame_node.cpp b/src/core/delegated_frame_node.cpp index eed407a09..d130fe33a 100644 --- a/src/core/delegated_frame_node.cpp +++ b/src/core/delegated_frame_node.cpp @@ -431,7 +431,7 @@ private: static inline QSharedPointer<QSGLayer> findRenderPassLayer(const int &id, const QVector<QPair<int, QSharedPointer<QSGLayer> > > &list) { typedef QPair<int, QSharedPointer<QSGLayer> > Pair; - Q_FOREACH (const Pair &pair, list) + for (const Pair &pair : list) if (pair.first == id) return pair.second; return QSharedPointer<QSGLayer>(); @@ -748,7 +748,7 @@ void DelegatedFrameNode::preprocess() // Then render any intermediate RenderPass in order. typedef QPair<int, QSharedPointer<QSGLayer> > Pair; - Q_FOREACH (const Pair &pair, m_sgObjects.renderPassLayers) { + for (const Pair &pair : qAsConst(m_sgObjects.renderPassLayers)) { // The layer is non-live, request a one-time update here. pair.second->scheduleUpdate(); // Proceed with the actual update. @@ -1270,7 +1270,7 @@ void DelegatedFrameNode::fetchAndSyncMailboxes(QList<MailboxTexture *> &mailboxe m_textureFences.swap(transferredFences); } - Q_FOREACH (gl::TransferableFence sync, transferredFences) { + for (gl::TransferableFence sync : qAsConst(transferredFences)) { // We need to wait on the fences on the Qt current context, and // can therefore not use GLFence routines that uses a different // concept of current context. @@ -1293,7 +1293,7 @@ void DelegatedFrameNode::fetchAndSyncMailboxes(QList<MailboxTexture *> &mailboxe GLuint fbo = 0; funcs->glGenFramebuffers(1, &fbo); - Q_FOREACH (MailboxTexture *mailboxTexture, mailboxesToFetch) { + for (MailboxTexture *mailboxTexture : qAsConst(mailboxesToFetch)) { // Read texture into QImage from shared context. // Switch to shared context. sharedContext->makeCurrent(m_offsurface.data()); diff --git a/src/core/download_manager_delegate_qt.cpp b/src/core/download_manager_delegate_qt.cpp index 5a5e5b79d..b8ef9c56d 100644 --- a/src/core/download_manager_delegate_qt.cpp +++ b/src/core/download_manager_delegate_qt.cpp @@ -184,7 +184,7 @@ bool DownloadManagerDelegateQt::DetermineDownloadTarget(content::DownloadItem* i item->GetLastReason() }; - Q_FOREACH (BrowserContextAdapterClient *client, clients) { + for (BrowserContextAdapterClient *client : qAsConst(clients)) { client->downloadRequested(info); if (info.accepted) break; @@ -279,7 +279,7 @@ void DownloadManagerDelegateQt::ChooseSavePath(content::WebContents *web_content BrowserContextAdapterClient::NoReason }; - Q_FOREACH (BrowserContextAdapterClient *client, clients) { + for (BrowserContextAdapterClient *client : qAsConst(clients)) { client->downloadRequested(info); if (info.accepted) break; @@ -339,7 +339,7 @@ void DownloadManagerDelegateQt::OnDownloadUpdated(content::DownloadItem *downloa download->GetLastReason() }; - Q_FOREACH (BrowserContextAdapterClient *client, clients) { + for (BrowserContextAdapterClient *client : qAsConst(clients)) { client->downloadUpdated(info); } } diff --git a/src/core/file_picker_controller.cpp b/src/core/file_picker_controller.cpp index 158ff7f67..3ded5ec41 100644 --- a/src/core/file_picker_controller.cpp +++ b/src/core/file_picker_controller.cpp @@ -70,7 +70,8 @@ void FilePickerController::accepted(const QVariant &files) if (files.canConvert(QVariant::StringList)) { stringList = files.toStringList(); } else if (files.canConvert<QList<QUrl> >()) { - Q_FOREACH (const QUrl &url, files.value<QList<QUrl> >()) + const QList<QUrl> urls = files.value<QList<QUrl>>(); + for (const QUrl &url : urls) stringList.append(url.toLocalFile()); } else { qWarning("An unhandled type '%s' was provided in FilePickerController::accepted(QVariant)", files.typeName()); @@ -87,8 +88,8 @@ void FilePickerController::rejected() static QStringList listRecursively(const QDir &dir) { QStringList ret; - QFileInfoList infoList(dir.entryInfoList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot | QDir::Hidden)); - Q_FOREACH (const QFileInfo &fileInfo, infoList) { + const QFileInfoList infoList(dir.entryInfoList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot | QDir::Hidden)); + for (const QFileInfo &fileInfo : infoList) { if (fileInfo.isDir()) { ret.append(fileInfo.absolutePath() + QStringLiteral("/.")); // Match chromium's behavior. See chrome/browser/file_select_helper.cc ret.append(listRecursively(QDir(fileInfo.absoluteFilePath()))); diff --git a/src/core/location_provider_qt.cpp b/src/core/location_provider_qt.cpp index d0b783b20..6cae63463 100644 --- a/src/core/location_provider_qt.cpp +++ b/src/core/location_provider_qt.cpp @@ -116,7 +116,8 @@ void QtPositioningHelper::start(bool highAccuracy) // Find high accuracy source if the default source is not already one. if (highAccuracy && !isHighAccuracySource(m_positionInfoSource)) { - Q_FOREACH (const QString &name, QGeoPositionInfoSource::availableSources()) { + const QStringList availableSources = QGeoPositionInfoSource::availableSources(); + for (const QString &name : availableSources) { if (name == m_positionInfoSource->sourceName()) continue; QGeoPositionInfoSource *source = QGeoPositionInfoSource::createSource(name, this); diff --git a/src/core/permission_manager_qt.cpp b/src/core/permission_manager_qt.cpp index c65da34af..bc714881b 100644 --- a/src/core/permission_manager_qt.cpp +++ b/src/core/permission_manager_qt.cpp @@ -101,7 +101,7 @@ void PermissionManagerQt::permissionRequestReply(const QUrl &origin, BrowserCont ++it; } } - Q_FOREACH (const RequestOrSubscription &subscriber, m_subscribers) { + for (const RequestOrSubscription &subscriber : qAsConst(m_subscribers)) { if (subscriber.origin == origin && subscriber.type == type) subscriber.callback.Run(status); } diff --git a/src/core/profile_io_data_qt.cpp b/src/core/profile_io_data_qt.cpp index cf13559bc..2cdd7aab1 100644 --- a/src/core/profile_io_data_qt.cpp +++ b/src/core/profile_io_data_qt.cpp @@ -478,7 +478,7 @@ void ProfileIODataQt::generateJobFactory() net::FtpProtocolHandler::Create(m_urlRequestContext->host_resolver())); m_installedCustomSchemes = m_customUrlSchemes; - Q_FOREACH (const QByteArray &scheme, m_installedCustomSchemes) { + for (const QByteArray &scheme : qAsConst(m_installedCustomSchemes)) { jobFactory->SetProtocolHandler(scheme.toStdString(), std::unique_ptr<net::URLRequestJobFactory::ProtocolHandler>( new CustomProtocolHandler(m_browserContextAdapter))); @@ -519,12 +519,12 @@ void ProfileIODataQt::regenerateJobFactory() if (m_customUrlSchemes == m_installedCustomSchemes) return; - Q_FOREACH (const QByteArray &scheme, m_installedCustomSchemes) { + for (const QByteArray &scheme : qAsConst(m_installedCustomSchemes)) { m_baseJobFactory->SetProtocolHandler(scheme.toStdString(), nullptr); } m_installedCustomSchemes = m_customUrlSchemes; - Q_FOREACH (const QByteArray &scheme, m_installedCustomSchemes) { + for (const QByteArray &scheme : qAsConst(m_installedCustomSchemes)) { m_baseJobFactory->SetProtocolHandler(scheme.toStdString(), std::unique_ptr<net::URLRequestJobFactory::ProtocolHandler>( new CustomProtocolHandler(m_browserContextAdapter))); diff --git a/src/core/renderer/user_resource_controller.cpp b/src/core/renderer/user_resource_controller.cpp index 2b8fc714a..6e28564f8 100644 --- a/src/core/renderer/user_resource_controller.cpp +++ b/src/core/renderer/user_resource_controller.cpp @@ -200,7 +200,7 @@ void UserResourceController::runScripts(UserScriptData::InjectionPoint p, blink: QList<uint64_t> scriptsToRun = m_viewUserScriptMap.value(0).toList(); scriptsToRun.append(m_viewUserScriptMap.value(renderView).toList()); - Q_FOREACH (uint64_t id, scriptsToRun) { + for (uint64_t id : qAsConst(scriptsToRun)) { const UserScriptData &script = m_scripts.value(id); if (script.injectionPoint != p || (!script.injectForSubframes && !isMainFrame)) @@ -365,7 +365,7 @@ void UserResourceController::renderViewDestroyed(content::RenderView *renderView ViewUserScriptMap::iterator it = m_viewUserScriptMap.find(renderView); if (it == m_viewUserScriptMap.end()) // ASSERT maybe? return; - Q_FOREACH (uint64_t id, it.value()) { + for (uint64_t id : qAsConst(it.value())) { m_scripts.remove(id); } m_viewUserScriptMap.remove(renderView); @@ -396,7 +396,7 @@ void UserResourceController::clearScriptsForView(content::RenderView *view) ViewUserScriptMap::iterator it = m_viewUserScriptMap.find(view); if (it == m_viewUserScriptMap.end()) return; - Q_FOREACH (uint64_t id, it.value()) + for (uint64_t id : qAsConst(it.value())) m_scripts.remove(id); m_viewUserScriptMap.remove(view); diff --git a/src/core/renderer_host/user_resource_controller_host.cpp b/src/core/renderer_host/user_resource_controller_host.cpp index d889915a6..ed4d736f2 100644 --- a/src/core/renderer_host/user_resource_controller_host.cpp +++ b/src/core/renderer_host/user_resource_controller_host.cpp @@ -75,7 +75,8 @@ void UserResourceControllerHost::WebContentsObserverHelper::RenderFrameCreated( content::RenderFrameHost *renderFrameHost) { content::WebContents *contents = web_contents(); - Q_FOREACH (const UserScript &script, m_controllerHost->m_perContentsScripts.value(contents)) + const QList<UserScript> scripts = m_controllerHost->m_perContentsScripts.value(contents); + for (const UserScript &script : scripts) renderFrameHost->Send(new RenderFrameObserverHelper_AddScript( renderFrameHost->GetRoutingID(), script.data())); } @@ -122,7 +123,7 @@ void UserResourceControllerHost::addUserScript(const UserScript &script, WebCont if (isProfileWideScript) { if (!m_profileWideScripts.contains(script)) { m_profileWideScripts.append(script); - Q_FOREACH (content::RenderProcessHost *renderer, m_observedProcesses) + for (content::RenderProcessHost *renderer : qAsConst(m_observedProcesses)) renderer->Send(new UserResourceController_AddScript(script.data())); } } else { @@ -168,7 +169,7 @@ bool UserResourceControllerHost::removeUserScript(const UserScript &script, WebC = std::find(m_profileWideScripts.begin(), m_profileWideScripts.end(), script); if (it == m_profileWideScripts.end()) return false; - Q_FOREACH (content::RenderProcessHost *renderer, m_observedProcesses) + for (content::RenderProcessHost *renderer : qAsConst(m_observedProcesses)) renderer->Send(new UserResourceController_RemoveScript((*it).data())); m_profileWideScripts.erase(it); } else { @@ -193,7 +194,7 @@ void UserResourceControllerHost::clearAllScripts(WebContentsAdapter *adapter) const bool isProfileWideScript = !adapter; if (isProfileWideScript) { m_profileWideScripts.clear(); - Q_FOREACH (content::RenderProcessHost *renderer, m_observedProcesses) + for (content::RenderProcessHost *renderer : qAsConst(m_observedProcesses)) renderer->Send(new UserResourceController_ClearScripts); } else { content::WebContents *contents = adapter->webContents(); @@ -229,7 +230,7 @@ void UserResourceControllerHost::renderProcessStartedWithHost(content::RenderPro m_renderProcessObserver.reset(new RenderProcessObserverHelper(this)); renderer->AddObserver(m_renderProcessObserver.data()); m_observedProcesses.insert(renderer); - Q_FOREACH (const UserScript &script, m_profileWideScripts) + for (const UserScript &script : qAsConst(m_profileWideScripts)) renderer->Send(new UserResourceController_AddScript(script.data())); } @@ -244,7 +245,7 @@ UserResourceControllerHost::UserResourceControllerHost() UserResourceControllerHost::~UserResourceControllerHost() { - Q_FOREACH (content::RenderProcessHost *renderer, m_observedProcesses) + for (content::RenderProcessHost *renderer : qAsConst(m_observedProcesses)) renderer->RemoveObserver(m_renderProcessObserver.data()); } diff --git a/src/core/type_conversion.h b/src/core/type_conversion.h index 023bed21e..5181bc23d 100644 --- a/src/core/type_conversion.h +++ b/src/core/type_conversion.h @@ -265,7 +265,7 @@ inline std::vector<T> toVector(const QStringList &fileList) { std::vector<T> selectedFiles; selectedFiles.reserve(fileList.size()); - Q_FOREACH (const QString &file, fileList) + for (const QString &file : fileList) selectedFiles.push_back(fileListingHelper<T>(file)); return selectedFiles; } diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index 9a544cb0a..fc1bbd044 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -1415,7 +1415,8 @@ bool WebContentsAdapter::handleDropDataFileContents(const content::DropData &dro static void fillDropDataFromMimeData(content::DropData *dropData, const QMimeData *mimeData) { Q_ASSERT(dropData->filenames.empty()); - Q_FOREACH (const QUrl &url, mimeData->urls()) { + const QList<QUrl> urls = mimeData->urls(); + for (const QUrl &url : urls) { if (url.isLocalFile()) { ui::FileInfo uifi; uifi.path = toFilePath(url.toLocalFile()); diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp index 515f763d2..950be89b9 100644 --- a/src/core/web_engine_library_info.cpp +++ b/src/core/web_engine_library_info.cpp @@ -168,7 +168,7 @@ QString subProcessPath() % QLatin1Char('/') % processBinary; } - Q_FOREACH (const QString &candidate, candidatePaths) { + for (const QString &candidate : qAsConst(candidatePaths)) { if (QFileInfo::exists(candidate)) { processPath = candidate; break; @@ -244,7 +244,7 @@ QString dictionariesPath() candidatePaths << libraryDictionariesPath; } - Q_FOREACH (const QString &candidate, candidatePaths) { + for (const QString &candidate : qAsConst(candidatePaths)) { if (QFileInfo::exists(candidate)) { potentialDictionariesPath = candidate; break; diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp index 4cd4b6452..7bad96a09 100644 --- a/src/core/web_engine_settings.cpp +++ b/src/core/web_engine_settings.cpp @@ -126,7 +126,7 @@ WebEngineSettings::~WebEngineSettings() if (parentSettings) parentSettings->childSettings.remove(this); // In QML the profile and its settings may be garbage collected before the page and its settings. - Q_FOREACH (WebEngineSettings *settings, childSettings) { + for (WebEngineSettings *settings : qAsConst(childSettings)) { settings->parentSettings = 0; } } @@ -426,7 +426,7 @@ bool WebEngineSettings::applySettingsToRendererPreferences(content::RendererPref void WebEngineSettings::scheduleApplyRecursively() { scheduleApply(); - Q_FOREACH (WebEngineSettings *settings, childSettings) { + for (WebEngineSettings *settings : qAsConst(childSettings)) { settings->scheduleApply(); } } 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()) { 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()) { diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp index 27f1ec616..aa65509c3 100644 --- a/tests/auto/quick/publicapi/tst_publicapi.cpp +++ b/tests/auto/quick/publicapi/tst_publicapi.cpp @@ -55,7 +55,7 @@ private Q_SLOTS: void publicAPI(); }; -static QList<const QMetaObject *> typesToCheck = QList<const QMetaObject *>() +static const QList<const QMetaObject *> typesToCheck = QList<const QMetaObject *>() << &QQuickWebEngineView::staticMetaObject << &QQuickWebEngineCertificateError::staticMetaObject << &QQuickWebEngineDownloadItem::staticMetaObject @@ -81,7 +81,7 @@ static QList<const QMetaObject *> typesToCheck = QList<const QMetaObject *>() static QList<const char *> knownEnumNames = QList<const char *>(); -static QStringList hardcodedTypes = QStringList() +static const QStringList hardcodedTypes = QStringList() << "QJSValue" << "QQmlListProperty<QQuickWebEngineScript>" << "QQmlWebChannel*" @@ -92,7 +92,7 @@ static QStringList hardcodedTypes = QStringList() << "QWebEngineCookieStore*" ; -static QStringList expectedAPI = QStringList() +static const QStringList expectedAPI = QStringList() << "QQuickWebEngineAuthenticationDialogRequest.AuthenticationTypeHTTP --> AuthenticationType" << "QQuickWebEngineAuthenticationDialogRequest.AuthenticationTypeProxy --> AuthenticationType" << "QQuickWebEngineAuthenticationDialogRequest.accepted --> bool" @@ -697,7 +697,7 @@ static bool isCheckedEnum(const QByteArray &typeName) if (tokens.size() == 3) { QByteArray &enumClass = tokens[0]; QByteArray &enumName = tokens[2]; - foreach (const QMetaObject *mo, typesToCheck) { + for (const QMetaObject *mo : typesToCheck) { if (mo->className() != enumClass) continue; for (int i = mo->enumeratorOffset(); i < mo->enumeratorCount(); ++i) @@ -706,7 +706,7 @@ static bool isCheckedEnum(const QByteArray &typeName) } } else if (tokens.size() == 1) { QByteArray &enumName = tokens[0]; - foreach (const char *knownEnumName, knownEnumNames) { + for (const char *knownEnumName : qAsConst(knownEnumNames)) { if (enumName == knownEnumName) return true; } @@ -716,7 +716,7 @@ static bool isCheckedEnum(const QByteArray &typeName) static bool isCheckedClass(const QByteArray &typeName) { - foreach (const QMetaObject *mo, typesToCheck) { + for (const QMetaObject *mo : typesToCheck) { QByteArray moTypeName(mo->className()); if (moTypeName == typeName || moTypeName + "*" == typeName) return true; @@ -752,7 +752,8 @@ static void gatherAPI(const QString &prefix, const QMetaMethod &method, QStringL *output << QString::fromLatin1("%1%2 --> %3").arg(prefix).arg(QString::fromLatin1(method.methodSignature())).arg(QString::fromLatin1(methodTypeName)); checkKnownType(methodTypeName); - foreach (QByteArray paramType, method.parameterTypes()) + const QList<QByteArray> paramTypes = method.parameterTypes(); + for (const QByteArray ¶mType : paramTypes) checkKnownType(paramType); } } @@ -773,23 +774,23 @@ static void gatherAPI(const QString &prefix, const QMetaObject *meta, QStringLis void tst_publicapi::publicAPI() { QStringList actualAPI; - foreach (const QMetaObject *meta, typesToCheck) + for (const QMetaObject *meta : typesToCheck) gatherAPI(QString::fromLatin1(meta->className()) + ".", meta, &actualAPI); // Uncomment to print the actual API. // QStringList sortedAPI(actualAPI); // std::sort(sortedAPI.begin(), sortedAPI.end()); - // foreach (QString actual, sortedAPI) + // for (const QString &actual : qAsConst(sortedAPI)) // printf(" << \"%s\"\n", qPrintable(actual)); // Make sure that nothing slips in the public API unintentionally. - foreach (QString actual, actualAPI) { + for (const QString &actual : qAsConst(actualAPI)) { if (!expectedAPI.contains(actual)) QEXPECT_FAIL("", qPrintable("Expected list is not up-to-date: " + actual), Continue); QVERIFY2(expectedAPI.contains(actual), qPrintable(actual)); } // Make sure that the expected list is up-to-date with intentionally added APIs. - foreach (QString expected, expectedAPI) { + for (const QString &expected : expectedAPI) { if (!actualAPI.contains(expected)) QEXPECT_FAIL("", qPrintable("Not implemented: " + expected), Continue); QVERIFY2(actualAPI.contains(expected), qPrintable(expected)); diff --git a/tests/auto/widgets/qwebenginehistory/tst_qwebenginehistory.cpp b/tests/auto/widgets/qwebenginehistory/tst_qwebenginehistory.cpp index 3c8025672..6209401cb 100644 --- a/tests/auto/widgets/qwebenginehistory/tst_qwebenginehistory.cpp +++ b/tests/auto/widgets/qwebenginehistory/tst_qwebenginehistory.cpp @@ -485,11 +485,11 @@ void tst_QWebEngineHistory::clear() void tst_QWebEngineHistory::historyItemFromDeletedPage() { - QList<QWebEngineHistoryItem> items = page->history()->items(); + const QList<QWebEngineHistoryItem> items = page->history()->items(); delete page; page = 0; - foreach (QWebEngineHistoryItem item, items) { + for (const QWebEngineHistoryItem &item : items) { QVERIFY(!item.isValid()); QTRY_COMPARE(item.originalUrl(), QUrl()); QTRY_COMPARE(item.url(), QUrl()); diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index 599d918b3..0015aa148 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -772,7 +772,8 @@ void tst_QWebEnginePage::updatePositionDependentActionsCrash() QPoint pos(0, 0); view.page()->updatePositionDependentActions(pos); QMenu* contextMenu = 0; - foreach (QObject* child, view.children()) { + const QList<QObject *> children = view.children(); + for (QObject *child : children) { contextMenu = qobject_cast<QMenu*>(child); if (contextMenu) break; @@ -794,7 +795,8 @@ void tst_QWebEnginePage::contextMenuCrash() view.page()->swallowContextMenuEvent(&event); view.page()->updatePositionDependentActions(pos); QMenu* contextMenu = 0; - foreach (QObject* child, view.children()) { + const QList<QObject *> children = view.children(); + for (QObject *child : children) { contextMenu = qobject_cast<QMenu*>(child); if (contextMenu) break; @@ -1838,8 +1840,8 @@ void tst_QWebEnginePage::findTextResult() QCOMPARE(findTextSync(m_page, ""), false); - QStringList words = (QStringList() << "foo" << "bar"); - foreach (QString subString, words) { + const QStringList words = { "foo", "bar" }; + for (const QString &subString : words) { QCOMPARE(findTextSync(m_page, subString), true); QCOMPARE(findTextSync(m_page, ""), false); } @@ -1899,7 +1901,8 @@ void tst_QWebEnginePage::supportedContentType() #endif // Add supported image types... - Q_FOREACH (const QByteArray& imageType, QImageWriter::supportedImageFormats()) { + const QList<QByteArray> supportedImageFormats = QImageWriter::supportedImageFormats(); + for (const QByteArray &imageType : supportedImageFormats) { const QString mimeType = getMimeTypeForExtension(imageType); if (!mimeType.isEmpty()) contentTypes << mimeType; @@ -1908,10 +1911,10 @@ void tst_QWebEnginePage::supportedContentType() // Get the mime types supported by webengine... const QStringList supportedContentTypes = m_page->supportedContentTypes(); - Q_FOREACH (const QString& mimeType, contentTypes) + for (const QString &mimeType : qAsConst(contentTypes)) QVERIFY2(supportedContentTypes.contains(mimeType), QString("'%1' is not a supported content type!").arg(mimeType).toLatin1()); - Q_FOREACH (const QString& mimeType, contentTypes) + for (const QString &mimeType : qAsConst(contentTypes)) QVERIFY2(m_page->supportsContentType(mimeType), QString("Cannot handle content types '%1'!").arg(mimeType).toLatin1()); #endif } @@ -2282,7 +2285,8 @@ void tst_QWebEnginePage::renderWidgetHostViewNotShowTopLevel() // Make sure that RenderWidgetHostViewQtDelegateWidgets are not shown as top-level. // They should only be made visible when parented to a QWebEngineView. - foreach (QWidget *widget, QApplication::topLevelWidgets()) + const QList<QWidget *> widgets = QApplication::topLevelWidgets(); + for (QWidget *widget : widgets) QCOMPARE(widget->isVisible(), false); } @@ -3612,7 +3616,8 @@ void tst_QWebEnginePage::setUrlToBadPort() static QStringList collectHistoryUrls(QWebEngineHistory *history) { QStringList urls; - foreach (const QWebEngineHistoryItem &i, history->items()) + const QList<QWebEngineHistoryItem> items = history->items(); + for (const QWebEngineHistoryItem &i : items) urls << i.url().toString(); return urls; } diff --git a/tests/quicktestbrowser/main.cpp b/tests/quicktestbrowser/main.cpp index 45661b5d4..00c1ee4ad 100644 --- a/tests/quicktestbrowser/main.cpp +++ b/tests/quicktestbrowser/main.cpp @@ -47,7 +47,7 @@ static QUrl startupUrl() QUrl ret; QStringList args(qApp->arguments()); args.takeFirst(); - Q_FOREACH (const QString& arg, args) { + for (const QString &arg : qAsConst(args)) { if (arg.startsWith(QLatin1Char('-'))) continue; ret = Utils::fromUserInput(arg); |