Port from qAsConst() to std::as_const()

We've been requiring C++17 since Qt 6.0, and our qAsConst use finally
starts to bother us (QTBUG-99313), so time to port away from it
now.

Since qAsConst has exactly the same semantics as std::as_const (down
to rvalue treatment, constexpr'ness and noexcept'ness), there's really
nothing more to it than a global search-and-replace.

This is a 6.4 re-run of the script we ran in dev, in order to avoid
conflicts between the branches when cherry-picking.

Change-Id: I5eca3df3179dfb2b2682c75a479ba9a4259cc703
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

23 files changed, 39 insertions, 39 deletions

diff --git a/examples/webenginewidgets/stylesheetbrowser/mainwindow.cpp b/examples/webenginewidgets/stylesheetbrowser/mainwindow.cpp
index cbe678fc8..ab786d5c9 100644
--- a/examples/webenginewidgets/stylesheetbrowser/mainwindow.cpp
+++ b/examples/webenginewidgets/stylesheetbrowser/mainwindow.cpp
@@ -27,7 +27,7 @@ MainWindow::MainWindow(const QUrl &url) :
         // Add back default style sheets if the user cleared them out
         loadDefaultStyleSheets();
     } else {
-        for (auto name : qAsConst(styleSheets)) {
+        for (auto name : std::as_const(styleSheets)) {
             StyleSheet styleSheet = settings.value(name).value<StyleSheet>();
             if (styleSheet.second)
                 insertStyleSheet(name, styleSheet.first, false);
diff --git a/src/core/api/qwebengineclientcertificatestore.cpp b/src/core/api/qwebengineclientcertificatestore.cpp
index e7837afce..243797193 100644
--- a/src/core/api/qwebengineclientcertificatestore.cpp
+++ b/src/core/api/qwebengineclientcertificatestore.cpp
@@ -54,7 +54,7 @@ void QWebEngineClientCertificateStore::add(const QSslCertificate &certificate, c
 QList<QSslCertificate> QWebEngineClientCertificateStore::certificates() const
 {
     QList<QSslCertificate> certificateList;
-    for (auto data : qAsConst(m_storeData->extraCerts))
+    for (auto data : std::as_const(m_storeData->extraCerts))
         certificateList.append(data->certificate);
     return certificateList;
 }
diff --git a/src/core/api/qwebenginecookiestore.cpp b/src/core/api/qwebenginecookiestore.cpp
index c17fde475..6c4536a4a 100644
--- a/src/core/api/qwebenginecookiestore.cpp
+++ b/src/core/api/qwebenginecookiestore.cpp
@@ -58,7 +58,7 @@ void QWebEngineCookieStorePrivate::processPendingUserCookies()
     if (m_pendingUserCookies.isEmpty())
         return;
 
-    for (const CookieData &cookieData : qAsConst(m_pendingUserCookies)) {
+    for (const CookieData &cookieData : std::as_const(m_pendingUserCookies)) {
         if (cookieData.wasDelete)
             delegate->deleteCookie(cookieData.cookie, cookieData.origin);
         else
diff --git a/src/core/api/qwebenginepage.cpp b/src/core/api/qwebenginepage.cpp
index 3b83a0b97..072b39650 100644
--- a/src/core/api/qwebenginepage.cpp
+++ b/src/core/api/qwebenginepage.cpp
@@ -845,9 +845,9 @@ QWebEnginePage::~QWebEnginePage()
         setDevToolsPage(nullptr);
         emit _q_aboutToDelete();
 
-        for (auto varFun : qAsConst(d_ptr->m_variantCallbacks))
+        for (auto varFun : std::as_const(d_ptr->m_variantCallbacks))
             varFun(QVariant());
-        for (auto strFun : qAsConst(d_ptr->m_stringCallbacks))
+        for (auto strFun : std::as_const(d_ptr->m_stringCallbacks))
             strFun(QString());
         d_ptr->m_variantCallbacks.clear();
         d_ptr->m_stringCallbacks.clear();
diff --git a/src/core/api/qwebenginescriptcollection.cpp b/src/core/api/qwebenginescriptcollection.cpp
index cdf9c9237..7867192b6 100644
--- a/src/core/api/qwebenginescriptcollection.cpp
+++ b/src/core/api/qwebenginescriptcollection.cpp
@@ -148,7 +148,7 @@ QList<QWebEngineScript> QWebEngineScriptCollectionPrivate::toList(const QString
         return m_scripts;
 
     QList<QWebEngineScript> ret;
-    for (const QWebEngineScript &script : qAsConst(m_scripts))
+    for (const QWebEngineScript &script : std::as_const(m_scripts))
         if (scriptName == script.name())
             ret.append(script);
     return ret;
@@ -173,7 +173,7 @@ void QWebEngineScriptCollectionPrivate::initializationFinished(QSharedPointer<Qt
     Q_ASSERT(m_contents);
     Q_ASSERT(contents);
 
-    for (const QWebEngineScript &script : qAsConst(m_scripts))
+    for (const QWebEngineScript &script : std::as_const(m_scripts))
         m_scriptController->addUserScript(*script.d, contents.data());
     m_contents = contents;
 }
diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp
index 92a00a5c8..67faabde8 100644
--- a/src/core/content_client_qt.cpp
+++ b/src/core/content_client_qt.cpp
@@ -296,7 +296,7 @@ static bool IsWidevineAvailable(base::FilePath *cdm_path,
 #endif
     }
 
-    for (const QString &pluginPath : qAsConst(pluginPaths)) {
+    for (const QString &pluginPath : std::as_const(pluginPaths)) {
         *cdm_path = QtWebEngineCore::toFilePath(pluginPath);
         if (base::PathExists(*cdm_path)) {
             // Add the supported codecs as if they came from the component manifest.
diff --git a/src/core/desktop_screen_qt.cpp b/src/core/desktop_screen_qt.cpp
index 47210aa09..898b8a1cc 100644
--- a/src/core/desktop_screen_qt.cpp
+++ b/src/core/desktop_screen_qt.cpp
@@ -69,7 +69,7 @@ DesktopScreenQt::DesktopScreenQt()
 
 DesktopScreenQt::~DesktopScreenQt()
 {
-    for (auto conn : qAsConst(m_connections))
+    for (auto conn : std::as_const(m_connections))
         QObject::disconnect(conn);
 }
 
diff --git a/src/core/download_manager_delegate_qt.cpp b/src/core/download_manager_delegate_qt.cpp
index 65884c9b6..69803c16b 100644
--- a/src/core/download_manager_delegate_qt.cpp
+++ b/src/core/download_manager_delegate_qt.cpp
@@ -157,7 +157,7 @@ bool DownloadManagerDelegateQt::DetermineDownloadTarget(download::DownloadItem *
             item->GetStartTime().ToTimeT()
         };
 
-        for (ProfileAdapterClient *client : qAsConst(clients)) {
+        for (ProfileAdapterClient *client : std::as_const(clients)) {
             client->downloadRequested(info);
             if (info.accepted)
                 break;
@@ -269,7 +269,7 @@ void DownloadManagerDelegateQt::ChooseSavePath(content::WebContents *web_content
         QDateTime::currentMSecsSinceEpoch()
     };
 
-    for (ProfileAdapterClient *client : qAsConst(clients)) {
+    for (ProfileAdapterClient *client : std::as_const(clients)) {
         client->downloadRequested(info);
         if (info.accepted)
             break;
@@ -317,7 +317,7 @@ void DownloadManagerDelegateQt::OnDownloadUpdated(download::DownloadItem *downlo
             download->GetStartTime().ToTimeT()
         };
 
-        for (ProfileAdapterClient *client : qAsConst(clients)) {
+        for (ProfileAdapterClient *client : std::as_const(clients)) {
             client->downloadUpdated(info);
         }
     }
diff --git a/src/core/file_picker_controller.cpp b/src/core/file_picker_controller.cpp
index 4d8b185df..f1b843e8a 100644
--- a/src/core/file_picker_controller.cpp
+++ b/src/core/file_picker_controller.cpp
@@ -187,7 +187,7 @@ void FilePickerController::filesSelectedInChooser(const QStringList &filesList)
         }
 
         std::vector<blink::mojom::FileChooserFileInfoPtr> chooser_files;
-        for (const auto &file : qAsConst(files)) {
+        for (const auto &file : std::as_const(files)) {
             chooser_files.push_back(blink::mojom::FileChooserFileInfo::NewNativeFile(
                     blink::mojom::NativeFileInfo::New(toFilePath(file), std::u16string())));
         }
@@ -200,7 +200,7 @@ void FilePickerController::filesSelectedInChooser(const QStringList &filesList)
                     static_cast<blink::mojom::FileChooserParams::Mode>(d_ptr->mode));
     } else if (d_ptr->fileSystemAccessDialogListener) {
         std::vector<base::FilePath> files;
-        for (const auto &file : qAsConst(filesList)) {
+        for (const auto &file : std::as_const(filesList)) {
             files.push_back(toFilePath(file));
         }
 
diff --git a/src/core/render_widget_host_view_qt_delegate_client.cpp b/src/core/render_widget_host_view_qt_delegate_client.cpp
index b192caf7f..7078b82f8 100644
--- a/src/core/render_widget_host_view_qt_delegate_client.cpp
+++ b/src/core/render_widget_host_view_qt_delegate_client.cpp
@@ -57,7 +57,7 @@ QList<TouchPoint> RenderWidgetHostViewQtDelegateClient::mapTouchPointIds(const Q
     Q_ASSERT(output.size() == std::accumulate(output.cbegin(), output.cend(), QSet<int>(),
                  [] (QSet<int> s, const TouchPoint &p) { s.insert(p.second.id()); return s; }).size());
 
-    for (auto &&point : qAsConst(input))
+    for (auto &&point : std::as_const(input))
         if (point.state() == QEventPoint::Released)
             m_touchIdMapping.remove(point.id());
 
@@ -536,7 +536,7 @@ void RenderWidgetHostViewQtDelegateClient::handleTouchEvent(QTouchEvent *event)
     auto sc = qScopeGuard([&] () {
         switch (event->type()) {
             case QEvent::TouchCancel:
-                for (auto &&it : qAsConst(touchPoints))
+                for (auto &&it : std::as_const(touchPoints))
                     m_touchIdMapping.remove(it.second.id());
                 Q_FALLTHROUGH();
 
diff --git a/src/core/render_widget_host_view_qt_delegate_item.cpp b/src/core/render_widget_host_view_qt_delegate_item.cpp
index f6962da14..a44046aac 100644
--- a/src/core/render_widget_host_view_qt_delegate_item.cpp
+++ b/src/core/render_widget_host_view_qt_delegate_item.cpp
@@ -307,7 +307,7 @@ void RenderWidgetHostViewQtDelegateItem::itemChange(ItemChange change, const Ite
 {
     QQuickItem::itemChange(change, value);
     if (change == QQuickItem::ItemSceneChange) {
-        for (const QMetaObject::Connection &c : qAsConst(m_windowConnections))
+        for (const QMetaObject::Connection &c : std::as_const(m_windowConnections))
             disconnect(c);
         m_windowConnections.clear();
         if (value.window) {
diff --git a/src/core/renderer/user_resource_controller.cpp b/src/core/renderer/user_resource_controller.cpp
index 4a0ba9e43..1588f26ec 100644
--- a/src/core/renderer/user_resource_controller.cpp
+++ b/src/core/renderer/user_resource_controller.cpp
@@ -163,7 +163,7 @@ void UserResourceController::runScripts(QtWebEngineCore::UserScriptData::Injecti
     QList<uint64_t> scriptsToRun = m_frameUserScriptMap.value(globalScriptsIndex);
     scriptsToRun.append(m_frameUserScriptMap.value(renderFrame));
 
-    for (uint64_t id : qAsConst(scriptsToRun)) {
+    for (uint64_t id : std::as_const(scriptsToRun)) {
         const QtWebEngineCore::UserScriptData &script = m_scripts.value(id);
         if (script.injectionPoint != p || (!script.injectForSubframes && !isMainFrame))
             continue;
@@ -295,7 +295,7 @@ void UserResourceController::renderFrameDestroyed(content::RenderFrame *renderFr
     FrameUserScriptMap::iterator it = m_frameUserScriptMap.find(renderFrame);
     if (it == m_frameUserScriptMap.end()) // ASSERT maybe?
         return;
-    for (uint64_t id : qAsConst(it.value())) {
+    for (uint64_t id : std::as_const(it.value())) {
         m_scripts.remove(id);
     }
     m_frameUserScriptMap.remove(renderFrame);
@@ -329,7 +329,7 @@ void UserResourceController::clearScriptsForFrame(content::RenderFrame *frame)
     FrameUserScriptMap::iterator it = m_frameUserScriptMap.find(frame);
     if (it == m_frameUserScriptMap.end())
         return;
-    for (uint64_t id : qAsConst(it.value()))
+    for (uint64_t id : std::as_const(it.value()))
         m_scripts.remove(id);
 
     m_frameUserScriptMap.remove(frame);
diff --git a/src/core/renderer_host/user_resource_controller_host.cpp b/src/core/renderer_host/user_resource_controller_host.cpp
index b24e87e8b..98a640695 100644
--- a/src/core/renderer_host/user_resource_controller_host.cpp
+++ b/src/core/renderer_host/user_resource_controller_host.cpp
@@ -184,7 +184,7 @@ void UserResourceControllerHost::renderProcessStartedWithHost(content::RenderPro
     auto userResourceController = new UserResourceControllerRemote;
     renderer->GetChannel()->GetRemoteAssociatedInterface(userResourceController);
     m_observedProcesses.insert(renderer, userResourceController);
-    for (const UserScript &script : qAsConst(m_profileWideScripts)) {
+    for (const UserScript &script : std::as_const(m_profileWideScripts)) {
         (*userResourceController)->AddScript(script.data());
     }
 }
diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp
index 151365693..588af5cc6 100644
--- a/src/core/web_engine_library_info.cpp
+++ b/src/core/web_engine_library_info.cpp
@@ -145,7 +145,7 @@ QString subProcessPath()
                               % QLatin1Char('/') % processBinary;
         }
 
-        for (const QString &candidate : qAsConst(candidatePaths)) {
+        for (const QString &candidate : std::as_const(candidatePaths)) {
             if (QFileInfo::exists(candidate)) {
                 processPath = candidate;
                 qCDebug(webEngineLibraryInfoLog, "Qt WebEngine process path: %s",
@@ -157,7 +157,7 @@ QString subProcessPath()
             QStringList errorMessage;
             errorMessage.append(
                     QStringLiteral("The following paths were searched for Qt WebEngine Process:"));
-            for (const QString &candidate : qAsConst(candidatePaths))
+            for (const QString &candidate : std::as_const(candidatePaths))
                 errorMessage.append(QStringLiteral("  ") % candidate);
             errorMessage.append(QStringLiteral("but could not find it."));
             if (fromEnv.isEmpty()) {
@@ -207,7 +207,7 @@ QString localesPath()
             candidatePaths << fallbackDir();
         }
 
-        for (const QString &candidate : qAsConst(candidatePaths)) {
+        for (const QString &candidate : std::as_const(candidatePaths)) {
             if (QFileInfo::exists(candidate % QDir::separator() % translationPakFilename)) {
                 potentialLocalesPath = candidate;
                 qCDebug(webEngineLibraryInfoLog, "Qt WebEngine locales path: %s",
@@ -220,7 +220,7 @@ QString localesPath()
             QStringList warningMessage;
             warningMessage.append(
                     QStringLiteral("The following paths were searched for Qt WebEngine locales:"));
-            for (const QString &candidate : qAsConst(candidatePaths))
+            for (const QString &candidate : std::as_const(candidatePaths))
                 warningMessage.append(QStringLiteral("  ") % candidate);
             warningMessage.append(
                     QStringLiteral(
@@ -275,7 +275,7 @@ QString dictionariesPath()
             candidatePaths << libraryDictionariesPath;
         }
 
-        for (const QString &candidate : qAsConst(candidatePaths)) {
+        for (const QString &candidate : std::as_const(candidatePaths)) {
             if (QFileInfo::exists(candidate)) {
                 potentialDictionariesPath = candidate;
                 qCDebug(webEngineLibraryInfoLog, "Qt WebEngine dictionaries path: %s",
@@ -310,7 +310,7 @@ QString resourcesPath()
             candidatePaths << fallbackDir();
         }
 
-        for (const QString &candidate : qAsConst(candidatePaths)) {
+        for (const QString &candidate : std::as_const(candidatePaths)) {
             if (QFileInfo::exists(candidate % QDir::separator() % resourcesPakFilename)) {
                 potentialResourcesPath = candidate;
                 qCDebug(webEngineLibraryInfoLog, "Qt WebEngine resources path: %s",
@@ -323,7 +323,7 @@ QString resourcesPath()
             QStringList errorMessage;
             errorMessage.append(QStringLiteral(
                     "The following paths were searched for Qt WebEngine resources:"));
-            for (const QString &candidate : qAsConst(candidatePaths))
+            for (const QString &candidate : std::as_const(candidatePaths))
                 errorMessage.append(QStringLiteral("  ") % candidate);
             errorMessage.append(QStringLiteral("but could not find any."));
             if (fromEnv.isEmpty()) {
diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp
index e7cc57ba4..3e829457e 100644
--- a/src/core/web_engine_settings.cpp
+++ b/src/core/web_engine_settings.cpp
@@ -78,7 +78,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.
-    for (WebEngineSettings *settings : qAsConst(childSettings))
+    for (WebEngineSettings *settings : std::as_const(childSettings))
         settings->parentSettings = nullptr;
 }
 
@@ -448,7 +448,7 @@ bool WebEngineSettings::applySettingsToRendererPreferences(blink::RendererPrefer
 void WebEngineSettings::scheduleApplyRecursively()
 {
     scheduleApply();
-    for (WebEngineSettings *settings : qAsConst(childSettings)) {
+    for (WebEngineSettings *settings : std::as_const(childSettings)) {
         settings->scheduleApply();
     }
 }
diff --git a/src/pdf/qpdfpagerenderer.cpp b/src/pdf/qpdfpagerenderer.cpp
index e46261817..771fc67ef 100644
--- a/src/pdf/qpdfpagerenderer.cpp
+++ b/src/pdf/qpdfpagerenderer.cpp
@@ -282,7 +282,7 @@ quint64 QPdfPageRenderer::requestPage(int pageNumber, QSize imageSize,
     if (!d_ptr->m_document || d_ptr->m_document->status() != QPdfDocument::Status::Ready)
         return 0;
 
-    for (const auto &request : qAsConst(d_ptr->m_pendingRequests)) {
+    for (const auto &request : std::as_const(d_ptr->m_pendingRequests)) {
         if (request.pageNumber == pageNumber
             && request.imageSize == imageSize
             && request.options == options)
diff --git a/src/webenginequick/ui_delegates_manager.cpp b/src/webenginequick/ui_delegates_manager.cpp
index 19dd04298..0c6cee763 100644
--- a/src/webenginequick/ui_delegates_manager.cpp
+++ b/src/webenginequick/ui_delegates_manager.cpp
@@ -136,7 +136,7 @@ bool UIDelegatesManager::ensureComponentLoaded(ComponentType type)
     if (!engine)
         return false;
 
-    for (const QString &importDir : qAsConst(m_importDirs)) {
+    for (const QString &importDir : std::as_const(m_importDirs)) {
         const QString componentFilePath = importDir % QLatin1Char('/') % fileName;
 
         if (!QFileInfo(componentFilePath).exists())
diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp
index ee0842c5f..b9aef4a38 100644
--- a/src/webenginewidgets/api/qwebengineview.cpp
+++ b/src/webenginewidgets/api/qwebengineview.cpp
@@ -184,7 +184,7 @@ protected:
         // 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.
-        for (const QMetaObject::Connection &c : qAsConst(m_windowConnections))
+        for (const QMetaObject::Connection &c : std::as_const(m_windowConnections))
             disconnect(c);
         m_windowConnections.clear();
         if (QWindow *w = Window()) {
diff --git a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
index 44c56561d..8b6822148 100644
--- a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
+++ b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
@@ -306,7 +306,7 @@ void tst_QWebEngineCookieStore::basicFilterOverHTTP()
     (void) httpServer.stop();
 
     QCOMPARE(resourceFirstParty.size(), accessTested.loadAcquire());
-    for (auto &&p : qAsConst(resourceFirstParty))
+    for (auto &&p : std::as_const(resourceFirstParty))
         QVERIFY2(p.second == firstPartyUrl,
                  qPrintable(QString("Resource [%1] has wrong firstPartyUrl: %2").arg(p.first.toString(), p.second.toString())));
 }
diff --git a/tests/auto/httpserver/httpserver.cpp b/tests/auto/httpserver/httpserver.cpp
index 30320950a..e08af77e7 100644
--- a/tests/auto/httpserver/httpserver.cpp
+++ b/tests/auto/httpserver/httpserver.cpp
@@ -80,7 +80,7 @@ void HttpServer::handleNewConnection()
         // if request wasn't handled or purposely ignored for default behavior
         // then try to serve htmls from resources dirs if set
         if (rr->requestMethod() == "GET") {
-            for (auto &&dir : qAsConst(m_dirs)) {
+            for (auto &&dir : std::as_const(m_dirs)) {
                 QFile f(dir + rr->requestPath());
                 if (f.exists()) {
                     if (f.open(QFile::ReadOnly)) {
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index 75c7cd4f7..371969b2a 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -892,12 +892,12 @@ void tst_publicapi::publicAPI()
     // Uncomment to print the actual API.
     // QStringList sortedAPI(actualAPI);
     // std::sort(sortedAPI.begin(), sortedAPI.end());
-    // for (const QString &actual : qAsConst(sortedAPI))
+    // for (const QString &actual : std::as_const(sortedAPI))
     //     printf("    << \"%s\"\n", qPrintable(actual));
 
     bool apiMatch = true;
     // Make sure that nothing slips in the public API unintentionally.
-    for (const QString &actual : qAsConst(actualAPI)) {
+    for (const QString &actual : std::as_const(actualAPI)) {
         if (!expectedAPI.contains(actual)) {
             qWarning("Expected list is not up-to-date: %ls", qUtf16Printable(actual));
             apiMatch = false;
diff --git a/tests/manual/quick/touchbrowser/main.cpp b/tests/manual/quick/touchbrowser/main.cpp
index b63f3b31c..7b222038e 100644
--- a/tests/manual/quick/touchbrowser/main.cpp
+++ b/tests/manual/quick/touchbrowser/main.cpp
@@ -17,7 +17,7 @@ static QUrl startupUrl()
     QUrl ret;
     QStringList args(qApp->arguments());
     args.takeFirst();
-    for (const QString &arg : qAsConst(args)) {
+    for (const QString &arg : std::as_const(args)) {
         if (arg.startsWith(QLatin1Char('-')))
              continue;
         ret = Utils::fromUserInput(arg);
diff --git a/tests/quicktestbrowser/main.cpp b/tests/quicktestbrowser/main.cpp
index 2d4fa544e..c41eb2f56 100644
--- a/tests/quicktestbrowser/main.cpp
+++ b/tests/quicktestbrowser/main.cpp
@@ -22,7 +22,7 @@ static QUrl startupUrl()
     QUrl ret;
     QStringList args(qApp->arguments());
     args.takeFirst();
-    for (const QString &arg : qAsConst(args)) {
+    for (const QString &arg : std::as_const(args)) {
         if (arg.startsWith(QLatin1Char('-')))
              continue;
         ret = Utils::fromUserInput(arg);