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.

Task-number: QTBUG-99313
Change-Id: I601bf70f020f511019ed28731ba53b14b765dbf0
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

17 files changed, 43 insertions, 43 deletions

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 98fefcb838..9ad2abe781 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -236,7 +236,7 @@ public Q_SLOTS:
         if (o) {
             checkForWindow(o);
             if (conf && qae)
-                for (PartialScene *ps : qAsConst(conf->completers))
+                for (PartialScene *ps : std::as_const(conf->completers))
                     if (o->inherits(ps->itemType().toUtf8().constData()))
                         contain(o, ps->container());
         }
@@ -612,7 +612,7 @@ int main(int argc, char *argv[])
     }
 #endif
 
-    for (const QString &path : qAsConst(files)) {
+    for (const QString &path : std::as_const(files)) {
         QUrl url = QUrl::fromUserInput(path, QDir::currentPath(), QUrl::AssumeLocalFile);
         if (verboseMode)
             printf("qml: loading %s\n", qPrintable(url.toString()));
diff --git a/tools/qmldom/qmldomtool.cpp b/tools/qmldom/qmldomtool.cpp
index 2ed7d069e6..30eeda3792 100644
--- a/tools/qmldom/qmldomtool.cpp
+++ b/tools/qmldom/qmldomtool.cpp
@@ -193,10 +193,10 @@ int main(int argc, char *argv[])
     {
         QDebug dbg = qDebug();
         dbg << "dirs:\n";
-        for (const QString &d : qAsConst(qmltypeDirs))
+        for (const QString &d : std::as_const(qmltypeDirs))
             dbg << "    '" << d << "'\n";
         dbg << "files:\n";
-        for (const QString &f : qAsConst(positionalArguments))
+        for (const QString &f : std::as_const(positionalArguments))
             dbg << "    '" << f << "'\n";
         dbg << "fieldFilter: " << filter.describeFieldsFilter();
         dbg << "\n";
@@ -211,7 +211,7 @@ int main(int argc, char *argv[])
         env.loadBuiltins();
     QList<DomItem> loadedFiles(positionalArguments.size());
     qsizetype iPos = 0;
-    for (const QString &s : qAsConst(positionalArguments)) {
+    for (const QString &s : std::as_const(positionalArguments)) {
         env.loadFile(
                 s, QString(),
                 [&loadedFiles, iPos](Path, const DomItem &, const DomItem &newIt) {
diff --git a/tools/qmleasing/splineeditor.cpp b/tools/qmleasing/splineeditor.cpp
index 700cb9ff34..dc71adafa4 100644
--- a/tools/qmleasing/splineeditor.cpp
+++ b/tools/qmleasing/splineeditor.cpp
@@ -265,7 +265,7 @@ QHash<QString, QEasingCurve> SplineEditor::presets() const
 QString SplineEditor::generateCode()
 {
     QString s = QLatin1String("[");
-    for (const QPointF &point : qAsConst(m_controlPoints)) {
+    for (const QPointF &point : std::as_const(m_controlPoints)) {
         s += QString::number(point.x(), 'g', 2) + QLatin1Char(',')
              + QString::number(point.y(), 'g', 3) + QLatin1Char(',');
     }
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index ea2ddac00d..b36591d1fd 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -281,7 +281,7 @@ QPair<QString, QString> resolveImportPath(const QString &uri, const QString &ver
     QString ver = version;
     QPair<QString, QString> candidate;
     while (true) {
-        for (const QString &qmlImportPath : qAsConst(g_qmlImportPaths)) {
+        for (const QString &qmlImportPath : std::as_const(g_qmlImportPaths)) {
             // Search for the most specific version first, and search
             // also for the version in parent modules. For example:
             // - qml/QtQml/Models.2.0
diff --git a/tools/qmljs/qmljs.cpp b/tools/qmljs/qmljs.cpp
index 07e0ea4c52..ae01e7560f 100644
--- a/tools/qmljs/qmljs.cpp
+++ b/tools/qmljs/qmljs.cpp
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
 
     QV4::GlobalExtensions::init(vm.globalObject, QJSEngine::ConsoleExtension | QJSEngine::GarbageCollectionExtension);
 
-    for (const QString &fn : qAsConst(args)) {
+    for (const QString &fn : std::as_const(args)) {
         QV4::ScopedValue result(scope);
         if (runAsModule) {
             auto module = vm.loadModule(QUrl::fromLocalFile(QFileInfo(fn).absoluteFilePath()));
diff --git a/tools/qmlls/qlanguageserver.cpp b/tools/qmlls/qlanguageserver.cpp
index 70cbd354b0..4f9c9fe77d 100644
--- a/tools/qmlls/qlanguageserver.cpp
+++ b/tools/qmlls/qlanguageserver.cpp
@@ -203,7 +203,7 @@ void QLanguageServer::setupCapabilities(const QLspSpecification::InitializeParam
                                         QLspSpecification::InitializeResult &serverInfo)
 {
     Q_D(QLanguageServer);
-    for (auto module : qAsConst(d->modules))
+    for (auto module : std::as_const(d->modules))
         module->setupCapabilities(clientInfo, serverInfo);
 }
 
diff --git a/tools/qmlls/qmlcompletionsupport.cpp b/tools/qmlls/qmlcompletionsupport.cpp
index 887929e6b7..8869b34921 100644
--- a/tools/qmlls/qmlcompletionsupport.cpp
+++ b/tools/qmlls/qmlcompletionsupport.cpp
@@ -473,7 +473,7 @@ static QList<CompletionItem> reachableSymbols(DomItem &context, const Completion
                     localSymbols.remove(it.key());
                     if (completeMethodCalls == FunctionCompletion::Declaration) {
                         QStringList parameters;
-                        for (const MethodParameter &pInfo : qAsConst(it->parameters)) {
+                        for (const MethodParameter &pInfo : std::as_const(it->parameters)) {
                             QStringList param;
                             if (!pInfo.typeName.isEmpty())
                                 param << pInfo.typeName;
diff --git a/tools/qmlls/qqmlcodemodel.cpp b/tools/qmlls/qqmlcodemodel.cpp
index 74a310b913..4259bd61c2 100644
--- a/tools/qmlls/qqmlcodemodel.cpp
+++ b/tools/qmlls/qqmlcodemodel.cpp
@@ -114,7 +114,7 @@ int QQmlCodeModel::indexEvalProgress() const
     Q_ASSERT(!m_mutex.tryLock()); // should be called while locked
     const int dirCost = 10;
     int costToDo = 1;
-    for (const ToIndex &el : qAsConst(m_toIndex))
+    for (const ToIndex &el : std::as_const(m_toIndex))
         costToDo += dirCost * el.leftDepth;
     costToDo += m_indexInProgressCost;
     return m_indexDoneCost * 100 / (costToDo + m_indexDoneCost);
diff --git a/tools/qmlls/workspace.cpp b/tools/qmlls/workspace.cpp
index 8291afc671..a18d5f6f8d 100644
--- a/tools/qmlls/workspace.cpp
+++ b/tools/qmlls/workspace.cpp
@@ -152,7 +152,7 @@ void WorkspaceHandlers::clientInitialized(QLanguageServer *server)
     if (clientInfo.workspaceFolders
         && std::holds_alternative<QList<WorkspaceFolder>>(*clientInfo.workspaceFolders)) {
         for (const WorkspaceFolder &workspace :
-             qAsConst(std::get<QList<WorkspaceFolder>>(*clientInfo.workspaceFolders))) {
+             std::as_const(std::get<QList<WorkspaceFolder>>(*clientInfo.workspaceFolders))) {
             const QUrl workspaceUrl(QString::fromUtf8(QmlLsp::lspUriToQmlUrl(workspace.uri)));
             rootPaths.insert(workspaceUrl.toLocalFile());
         }
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index 9f39d1f2df..0b61a8bb75 100644
--- a/tools/qmlplugindump/main.cpp
+++ b/tools/qmlplugindump/main.cpp
@@ -496,7 +496,7 @@ public:
             }
         }
 
-        for (const QMetaObject *meta : qAsConst(objectsToMerge)) {
+        for (const QMetaObject *meta : std::as_const(objectsToMerge)) {
             for (int index = meta->enumeratorOffset(); index < meta->enumeratorCount(); ++index)
                 dump(meta->enumerator(index));
 
@@ -885,7 +885,7 @@ static bool getDependencies(const QQmlEngine &engine, const QString &pluginImpor
 
     if (!importScanner.waitForFinished()) {
         std::cerr << "failure to start " << qPrintable(command);
-        for (const QString &arg : qAsConst(commandArgs))
+        for (const QString &arg : std::as_const(commandArgs))
             std::cerr << ' ' << qPrintable(arg);
         std::cerr << std::endl;
         return false;
@@ -1198,7 +1198,7 @@ int main(int argc, char *argv[])
     // load the QtQml builtins and the dependencies
     {
         QByteArray code(qtQmlImportString.toUtf8());
-        for (const QString &moduleToImport : qAsConst(dependencies)) {
+        for (const QString &moduleToImport : std::as_const(dependencies)) {
             code.append("\nimport ");
             code.append(moduleToImport.toUtf8());
         }
@@ -1262,7 +1262,7 @@ int main(int argc, char *argv[])
                         QString::number(qtObjectType.version().minorVersion())).toUtf8();
         }
         // avoid importing dependencies?
-        for (const QString &moduleToImport : qAsConst(dependencies)) {
+        for (const QString &moduleToImport : std::as_const(dependencies)) {
             importCode.append("\nimport ");
             importCode.append(moduleToImport.toUtf8());
         }
@@ -1299,7 +1299,7 @@ int main(int argc, char *argv[])
             it->erase(std::unique(it->begin(), it->end()), it->end());
         }
 
-        for (const QMetaObject *mo : qAsConst(candidates)) {
+        for (const QMetaObject *mo : std::as_const(candidates)) {
             if (mo->className() != QLatin1String("Qt"))
                 metas.insert(mo);
         }
@@ -1327,13 +1327,13 @@ int main(int argc, char *argv[])
 
     // put the metaobjects into a map so they are always dumped in the same order
     QMap<QString, const QMetaObject *> nameToMeta;
-    for (const QMetaObject *meta : qAsConst(metas))
+    for (const QMetaObject *meta : std::as_const(metas))
         nameToMeta.insert(convertToId(meta), meta);
 
     Dumper dumper(&qml);
     if (relocatable)
         dumper.setRelocatableModuleUri(pluginImportUri);
-    for (const QMetaObject *meta : qAsConst(nameToMeta)) {
+    for (const QMetaObject *meta : std::as_const(nameToMeta)) {
         dumper.dump(QQmlEnginePrivate::get(&engine), meta, uncreatableMetas.contains(meta), singletonMetas.contains(meta));
     }
 
diff --git a/tools/qmlpreview/qmlpreviewfilesystemwatcher.cpp b/tools/qmlpreview/qmlpreviewfilesystemwatcher.cpp
index 9034b3559e..4db2c03b20 100644
--- a/tools/qmlpreview/qmlpreviewfilesystemwatcher.cpp
+++ b/tools/qmlpreview/qmlpreviewfilesystemwatcher.cpp
@@ -119,7 +119,7 @@ void QmlPreviewFileSystemWatcher::onDirectoryChanged(const QString &path)
             toReadd.removeOne(rejected);
 
         // If we've successfully added the file, that means it was deleted and replaced.
-        for (const QString &reAdded : qAsConst(toReadd))
+        for (const QString &reAdded : std::as_const(toReadd))
             emit fileChanged(reAdded);
     }
 }
diff --git a/tools/qmlprofiler/qmlprofilerdata.cpp b/tools/qmlprofiler/qmlprofilerdata.cpp
index cac1364b87..8f75226fd8 100644
--- a/tools/qmlprofiler/qmlprofilerdata.cpp
+++ b/tools/qmlprofiler/qmlprofilerdata.cpp
@@ -211,7 +211,7 @@ void QmlProfilerData::computeQmlTime()
     qint64 level0Start = -1;
     int level = 0;
 
-    for (const QQmlProfilerEvent &event : qAsConst(d->events)) {
+    for (const QQmlProfilerEvent &event : std::as_const(d->events)) {
         const QQmlProfilerEventType &type = d->eventTypes.at(event.typeIndex());
         if (type.message() != MaximumMessage)
             continue;
@@ -510,7 +510,7 @@ bool QmlProfilerData::save(const QString &filename)
         }
     };
 
-    for (const QQmlProfilerEvent &event : qAsConst(d->events)) {
+    for (const QQmlProfilerEvent &event : std::as_const(d->events)) {
         const QQmlProfilerEventType &type = d->eventTypes.at(event.typeIndex());
 
         if (type.rangeType() != MaximumRangeType) {
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index 0bff754e4c..891b7534bd 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -454,7 +454,7 @@ int main(int argc, char ** argv)
     }
     QSurfaceFormat::setDefaultFormat(surfaceFormat);
 
-    for (Qt::ApplicationAttribute a : qAsConst(options.applicationAttributes))
+    for (Qt::ApplicationAttribute a : std::as_const(options.applicationAttributes))
         QCoreApplication::setAttribute(a);
     QScopedPointer<QGuiApplication> app;
 #ifdef QT_WIDGETS_LIB
diff --git a/tools/qmltc/qmltccodewriter.cpp b/tools/qmltc/qmltccodewriter.cpp
index 7c9958e215..b2722d1e37 100644
--- a/tools/qmltc/qmltccodewriter.cpp
+++ b/tools/qmltc/qmltccodewriter.cpp
@@ -199,23 +199,23 @@ void QmltcCodeWriter::write(QmltcOutputWrapper &code, const QmltcProgram &progra
     writeUrl(code, program.urlMethod);
 
     // forward declare all the types first
-    for (const QmltcType &type : qAsConst(program.compiledTypes))
+    for (const QmltcType &type : std::as_const(program.compiledTypes))
         code.rawAppendToHeader(u"class " + type.cppType + u";");
     // write all the types and their content
-    for (const QmltcType &type : qAsConst(program.compiledTypes))
+    for (const QmltcType &type : std::as_const(program.compiledTypes))
         write(code, type);
 
     // add typeCount definitions. after all types have been written down (so
     // they are now complete types as per C++). practically, this only concerns
     // document root type
-    for (const QmltcType &type : qAsConst(program.compiledTypes)) {
+    for (const QmltcType &type : std::as_const(program.compiledTypes)) {
         if (!type.typeCount)
             continue;
         code.rawAppendToHeader(u""); // blank line
         code.rawAppendToHeader(u"constexpr %1 %2::%3()"_s.arg(type.typeCount->returnType,
                                                               type.cppType, type.typeCount->name));
         code.rawAppendToHeader(u"{");
-        for (const QString &line : qAsConst(type.typeCount->body))
+        for (const QString &line : std::as_const(type.typeCount->body))
             code.rawAppendToHeader(line, 1);
         code.rawAppendToHeader(u"}");
     }
@@ -240,7 +240,7 @@ static void dumpFunctions(QmltcOutputWrapper &code, const QList<QmltcMethod> &fu
 
     for (auto it = orderedFunctions.cbegin(); it != orderedFunctions.cend(); ++it) {
         code.rawAppendToHeader(it.key() + u":", -1);
-        for (const QmltcMethod *function : qAsConst(it.value()))
+        for (const QmltcMethod *function : std::as_const(it.value()))
             QmltcCodeWriter::write(code, *function);
     }
 }
@@ -264,7 +264,7 @@ void QmltcCodeWriter::write(QmltcOutputWrapper &code, const QmltcType &type)
 
     code.rawAppendToHeader(constructClassString());
     code.rawAppendToHeader(u"{");
-    for (const QString &mocLine : qAsConst(type.mocCode))
+    for (const QString &mocLine : std::as_const(type.mocCode))
         code.rawAppendToHeader(mocLine, 1);
 
     QmltcOutputWrapper::MemberNameScope typeScope(&code, type.cppType);
@@ -294,7 +294,7 @@ void QmltcCodeWriter::write(QmltcOutputWrapper &code, const QmltcType &type)
             QmltcCodeWriter::write(code, *type.dtor);
 
         // enums
-        for (const auto &enumeration : qAsConst(type.enums))
+        for (const auto &enumeration : std::as_const(type.enums))
             QmltcCodeWriter::write(code, enumeration);
 
         // visible functions
@@ -331,7 +331,7 @@ void QmltcCodeWriter::write(QmltcOutputWrapper &code, const QmltcType &type)
         }
 
         // children
-        for (const auto &child : qAsConst(type.children))
+        for (const auto &child : std::as_const(type.children))
             QmltcCodeWriter::write(code, child);
 
         // (non-visible) functions
@@ -342,14 +342,14 @@ void QmltcCodeWriter::write(QmltcOutputWrapper &code, const QmltcType &type)
             code.rawAppendToHeader(u""); // blank line
             code.rawAppendToHeader(u"protected:", -1);
         }
-        for (const auto &property : qAsConst(type.properties))
+        for (const auto &property : std::as_const(type.properties))
             write(code, property);
-        for (const auto &variable : qAsConst(type.variables))
+        for (const auto &variable : std::as_const(type.variables))
             write(code, variable);
     }
 
     code.rawAppendToHeader(u"private:", -1);
-    for (const QString &otherLine : qAsConst(type.otherCode))
+    for (const QString &otherLine : std::as_const(type.otherCode))
         code.rawAppendToHeader(otherLine, 1);
 
     if (type.typeCount) {
@@ -396,7 +396,7 @@ void QmltcCodeWriter::write(QmltcOutputWrapper &code, const QmltcMethod &method)
         {
             QmltcOutputWrapper::CppIndentationScope cppIndent(&code);
             Q_UNUSED(cppIndent);
-            for (const QString &line : qAsConst(method.body))
+            for (const QString &line : std::as_const(method.body))
                 code.rawAppendToCpp(line);
         }
         code.rawAppendToCpp(u"}");
@@ -419,7 +419,7 @@ static void writeSpecialMethod(QmltcOutputWrapper &code, const QmltcMethodBase &
     {
         QmltcOutputWrapper::CppIndentationScope cppIndent(&code);
         Q_UNUSED(cppIndent);
-        for (const QString &line : qAsConst(specialMethod.body))
+        for (const QString &line : std::as_const(specialMethod.body))
             code.rawAppendToCpp(line);
     }
     code.rawAppendToCpp(u"}");
@@ -472,7 +472,7 @@ void QmltcCodeWriter::writeUrl(QmltcOutputWrapper &code, const QmltcMethod &urlM
     {
         QmltcOutputWrapper::CppIndentationScope cppIndent(&code);
         Q_UNUSED(cppIndent);
-        for (const QString &line : qAsConst(urlMethod.body))
+        for (const QString &line : std::as_const(urlMethod.body))
             code.rawAppendToCpp(line);
     }
     code.rawAppendToCpp(u"}");
diff --git a/tools/qmltc/qmltccompiler.cpp b/tools/qmltc/qmltccompiler.cpp
index 141bf7e83b..ebc4dee7ff 100644
--- a/tools/qmltc/qmltccompiler.cpp
+++ b/tools/qmltc/qmltccompiler.cpp
@@ -360,7 +360,7 @@ void QmltcCompiler::compileTypeElements(QmltcType &current, const QQmlJSScope::C
               [](const QQmlJSMetaProperty &x, const QQmlJSMetaProperty &y) {
                   return x.index() < y.index();
               });
-    for (const QQmlJSMetaProperty &p : qAsConst(properties)) {
+    for (const QQmlJSMetaProperty &p : std::as_const(properties)) {
         if (p.index() == -1) {
             recordError(type->sourceLocation(),
                         u"Internal error: property '%1' has incomplete information"_s.arg(
diff --git a/tools/qmltc/qmltcvisitor.cpp b/tools/qmltc/qmltcvisitor.cpp
index a95ee1cac3..2bc6079418 100644
--- a/tools/qmltc/qmltcvisitor.cpp
+++ b/tools/qmltc/qmltcvisitor.cpp
@@ -312,7 +312,7 @@ void QmltcVisitor::endVisit(QQmlJS::AST::UiProgram *program)
         return;
 
     QHash<QQmlJSScope::ConstPtr, QList<QQmlJSMetaPropertyBinding>> bindings;
-    for (const QQmlJSScope::ConstPtr &type : qAsConst(m_qmlTypes)) {
+    for (const QQmlJSScope::ConstPtr &type : std::as_const(m_qmlTypes)) {
         if (isOrUnderComponent(type))
             continue;
         bindings.insert(type, type->ownPropertyBindingsInQmlIROrder());
@@ -499,7 +499,7 @@ void QmltcVisitor::postVisitResolve(
     // add explicit components to the object creation indices
     {
         QHash<InlineComponentOrDocumentRootName, qsizetype> index;
-        for (const QQmlJSScope::ConstPtr &c : qAsConst(explicitComponents)) {
+        for (const QQmlJSScope::ConstPtr &c : std::as_const(explicitComponents)) {
             const InlineComponentOrDocumentRootName inlineComponent =
                     c->enclosingInlineComponentName();
             m_creationIndices[c] =
diff --git a/tools/shared/qqmltoolingsettings.cpp b/tools/shared/qqmltoolingsettings.cpp
index 6bfd419aa2..dffd59fbc7 100644
--- a/tools/shared/qqmltoolingsettings.cpp
+++ b/tools/shared/qqmltoolingsettings.cpp
@@ -83,7 +83,7 @@ bool QQmlToolingSettings::search(const QString &path)
         const QString iniFile = dir.absoluteFilePath(settingsFileName);
 
         if (read(iniFile)) {
-            for (const QString &dir : qAsConst(dirs))
+            for (const QString &dir : std::as_const(dirs))
                 m_seenDirectories[dir] = iniFile;
             return true;
         }
@@ -94,7 +94,7 @@ bool QQmlToolingSettings::search(const QString &path)
 
     if (const QString iniFile = QStandardPaths::locate(QStandardPaths::GenericConfigLocation, u"%1.ini"_s.arg(m_toolName)); !iniFile.isEmpty()) {
         if (read(iniFile)) {
-            for (const QString &dir : qAsConst(dirs))
+            for (const QString &dir : std::as_const(dirs))
                 m_seenDirectories[dir] = iniFile;
             return true;
         }
@@ -102,7 +102,7 @@ bool QQmlToolingSettings::search(const QString &path)
 
     // No INI file found anywhere, record the failure so we won't have to traverse the entire
     // filesystem again
-    for (const QString &dir : qAsConst(dirs))
+    for (const QString &dir : std::as_const(dirs))
         m_seenDirectories[dir] = QString();
 
     return false;