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, with manual
unstaging of the actual definition and documentation in dist/,
src/corelib/doc/ and src/corelib/global/.

Task-number: QTBUG-99313
Change-Id: I4c7114444a325ad4e62d0fcbfd347d2bbfb21541
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>

9 files changed, 31 insertions, 31 deletions

diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index 53f1c4f793..f5f0d2619c 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -429,17 +429,17 @@ ProjectBuilderSources::files(QMakeProject *project) const
 
 static QString xcodeFiletypeForFilename(const QString &filename)
 {
-    for (const QString &ext : qAsConst(Option::cpp_ext)) {
+    for (const QString &ext : std::as_const(Option::cpp_ext)) {
         if (filename.endsWith(ext))
             return QStringLiteral("sourcecode.cpp.cpp");
     }
 
-    for (const QString &ext : qAsConst(Option::c_ext)) {
+    for (const QString &ext : std::as_const(Option::c_ext)) {
         if (filename.endsWith(ext))
             return QStringLiteral("sourcecode.c.c");
     }
 
-    for (const QString &ext : qAsConst(Option::h_ext)) {
+    for (const QString &ext : std::as_const(Option::h_ext)) {
         if (filename.endsWith(ext))
             return "sourcecode.c.h";
     }
@@ -1181,13 +1181,13 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
 
             if (copyBundleResources && ((!osx && path.isEmpty())
                                         || (osx && path == QLatin1String("Contents/Resources")))) {
-                for (const ProString &s : qAsConst(bundle_files))
+                for (const ProString &s : std::as_const(bundle_files))
                     bundle_resources_files << s;
             } else if (copyBundleResources && isEmbeddedFramework) {
-                for (const ProString &s : qAsConst(bundle_files))
+                for (const ProString &s : std::as_const(bundle_files))
                     embedded_frameworks << s;
             } else if (copyBundleResources && isEmbeddedPlugin) {
-                for (const ProString &s : qAsConst(bundle_files)) {
+                for (const ProString &s : std::as_const(bundle_files)) {
                     ProString subpath = (path == pluginsPrefix) ? ProString() : path.mid(pluginsPrefix.size() + 1);
                     embedded_plugins[subpath] << s;
                 }
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index e94d088a3f..f705a9bfee 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -1031,7 +1031,7 @@ MakefileGenerator::writeProjectMakefile()
 
         //install
         t << "install: ";
-        for (SubTarget *s : qAsConst(targets))
+        for (SubTarget *s : std::as_const(targets))
             t << s->target << '-';
         t << "install " << Qt::endl;
 
@@ -1961,7 +1961,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
             if (raw_clean.isEmpty())
                 raw_clean << tmp_out;
             QString tmp_clean;
-            for (const QString &rc : qAsConst(raw_clean))
+            for (const QString &rc : std::as_const(raw_clean))
                 tmp_clean += ' ' + escapeFilePath(Option::fixPathToTargetOS(rc));
             QString tmp_clean_cmds = project->values(ProKey(*it + ".clean_commands")).join(' ');
             if(!tmp_inputs.isEmpty())
@@ -1986,7 +1986,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
                     for (ProStringList::ConstIterator input = tmp_inputs.cbegin(); input != tmp_inputs.cend(); ++input) {
                         QString tinp = (*input).toQString();
                         QString out = replaceExtraCompilerVariables(tmp_out, tinp, QString(), NoShell);
-                        for (const QString &rc : qAsConst(raw_clean)) {
+                        for (const QString &rc : std::as_const(raw_clean)) {
                             dels << ' ' + escapeFilePath(fileFixify(
                                     replaceExtraCompilerVariables(rc, tinp, out, NoShell),
                                     FileFixifyFromOutdir));
@@ -1997,7 +1997,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
                     } else {
                         QString files;
                         const int commandlineLimit = 2047; // NT limit, expanded
-                        for (const QString &file : qAsConst(dels)) {
+                        for (const QString &file : std::as_const(dels)) {
                             if(del_statement.size() + files.size() +
                                qMax(fixEnvVariables(file).size(), file.size()) > commandlineLimit) {
                                 cleans.append(files);
@@ -2263,11 +2263,11 @@ QString MakefileGenerator::buildArgs(bool withExtra)
 {
     QString ret;
 
-    for (const QString &arg : qAsConst(Option::globals->qmake_args))
+    for (const QString &arg : std::as_const(Option::globals->qmake_args))
         ret += " " + shellQuote(arg);
     if (withExtra && !Option::globals->qmake_extra_args.isEmpty()) {
         ret += " --";
-        for (const QString &arg : qAsConst(Option::globals->qmake_extra_args))
+        for (const QString &arg : std::as_const(Option::globals->qmake_extra_args))
             ret += " " + shellQuote(arg);
     }
     return ret;
diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp
index 1f3fe93141..8e8d42cc96 100644
--- a/qmake/generators/makefiledeps.cpp
+++ b/qmake/generators/makefiledeps.cpp
@@ -809,7 +809,7 @@ bool QMakeSourceFileInfo::findDeps(SourceFile *file)
                         }
                     }
                     if(!exists) { //path lookup
-                        for (const QMakeLocalFileName &depdir : qAsConst(depdirs)) {
+                        for (const QMakeLocalFileName &depdir : std::as_const(depdirs)) {
                             QMakeLocalFileName f(depdir.real() + Option::dir_sep + lfn.real());
                             QFileInfo fi(findFileInfo(f));
                             if(fi.exists() && !fi.isDir()) {
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index 51f6ffe142..ac8f48c2a6 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -14,7 +14,7 @@ QT_BEGIN_NAMESPACE
 ProStringList UnixMakefileGenerator::libdirToFlags(const ProKey &key)
 {
     ProStringList results;
-    for (const auto &libdir : qAsConst(project->values(key))) {
+    for (const auto &libdir : std::as_const(project->values(key))) {
         if (!project->isEmpty("QMAKE_LFLAGS_RPATH") && project->isActiveConfig("rpath_libdirs"))
             project->values("QMAKE_LFLAGS") += var("QMAKE_LFLAGS_RPATH") + libdir;
         results.append("-L" + escapeFilePath(libdir));
@@ -299,7 +299,7 @@ QStringList
             ProStringList pchArchs = project->values("QMAKE_PCH_ARCHS");
             if (pchArchs.isEmpty())
                 pchArchs << ProString(); // normal single-arch PCH
-            for (const ProString &arch : qAsConst(pchArchs)) {
+            for (const ProString &arch : std::as_const(pchArchs)) {
                 auto pfx = header_prefix;
                 if (!arch.isEmpty())
                     pfx.replace(QLatin1String("${QMAKE_PCH_ARCH}"), arch.toQString());
@@ -337,7 +337,7 @@ QStringList
                     ProStringList pchArchs = project->values("QMAKE_PCH_ARCHS");
                     if (pchArchs.isEmpty())
                         pchArchs << ProString(); // normal single-arch PCH
-                    for (const ProString &arch : qAsConst(pchArchs)) {
+                    for (const ProString &arch : std::as_const(pchArchs)) {
                         QString precompiledHeader = header_prefix + language + header_suffix;
                         if (!arch.isEmpty()) {
                             precompiledHeader.replace(QLatin1String("${QMAKE_PCH_ARCH}"),
@@ -392,7 +392,7 @@ UnixMakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
                     libdirs.insert(libidx++, f);
                 } else if(opt.startsWith("-l")) {
                     QString lib = opt.mid(2);
-                    for (const QMakeLocalFileName &libdir : qAsConst(libdirs)) {
+                    for (const QMakeLocalFileName &libdir : std::as_const(libdirs)) {
                         QString libBase = libdir.local() + '/'
                                 + project->first("QMAKE_PREFIX_SHLIB") + lib;
                         if (linkPrl && processPrlFile(libBase, true))
@@ -418,7 +418,7 @@ UnixMakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
                             frameworkName.truncate(suffixPosition);
                             opt.remove(suffixMarker); // Apply suffix by removing marker
                         }
-                        for (const QMakeLocalFileName &dir : qAsConst(frameworkdirs)) {
+                        for (const QMakeLocalFileName &dir : std::as_const(frameworkdirs)) {
                             auto processPrlIfFound = [&](QString directory) {
                                 QString suffixedPrl = directory + opt;
                                 if (processPrlFile(suffixedPrl, true))
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 0b485ab706..6c9424804d 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -805,7 +805,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                 QString icon = fileFixify(var("ICON"));
                 t << "@$(DEL_FILE) " << info_plist_out << "\n\t"
                   << "@sed ";
-                for (const ProString &arg : qAsConst(commonSedArgs))
+                for (const ProString &arg : std::as_const(commonSedArgs))
                     t << arg;
                 const QString iconName = icon.section(Option::dir_sep, -1);
                 t << "-e \"s,@ICON@," << iconName << ",g\" "
@@ -837,7 +837,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                     symlinks[bundle_dir + "Resources"] = "Versions/Current/Resources";
                 t << "@$(DEL_FILE) " << info_plist_out << "\n\t"
                   << "@sed ";
-                for (const ProString &arg : qAsConst(commonSedArgs))
+                for (const ProString &arg : std::as_const(commonSedArgs))
                     t << arg;
                 t << "-e \"s,@LIBRARY@," << lib_bundle_name << ",g\" "
                   << "-e \"s,\\$${EXECUTABLE_NAME}," << lib_bundle_name << ",g\" "
@@ -977,7 +977,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
             ProStringList pchArchs = project->values("QMAKE_PCH_ARCHS");
             if (pchArchs.isEmpty())
                 pchArchs << ProString(); // normal single-arch PCH
-            for (const ProString &arch : qAsConst(pchArchs)) {
+            for (const ProString &arch : std::as_const(pchArchs)) {
                 ProString pchOutput;
                 if (!project->isEmpty("PRECOMPILED_DIR"))
                     pchOutput = project->first("PRECOMPILED_DIR");
@@ -1008,7 +1008,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                 ProStringList pchArchs = project->values("QMAKE_PCH_ARCHS");
                 if (pchArchs.isEmpty())
                     pchArchs << ProString(); // normal single-arch PCH
-                for (const ProString &arch : qAsConst(pchArchs)) {
+                for (const ProString &arch : std::as_const(pchArchs)) {
                     QString file = precomph_out_dir + header_prefix + language + header_suffix;
                     if (!arch.isEmpty())
                         file.replace(QStringLiteral("${QMAKE_PCH_ARCH}"), arch.toQString());
@@ -1106,7 +1106,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
             }
             pchFlags.replace(QLatin1String("${QMAKE_PCH_INPUT}"), escapeFilePath(pchInput))
                     .replace(QLatin1String("${QMAKE_PCH_OUTPUT_BASE}"), escapeFilePath(pchBaseName.toQString()));
-            for (const ProString &arch : qAsConst(pchArchs)) {
+            for (const ProString &arch : std::as_const(pchArchs)) {
                 auto pchArchOutput = pchOutput.toQString();
                 if (!arch.isEmpty())
                     pchArchOutput.replace(QStringLiteral("${QMAKE_PCH_ARCH}"), arch.toQString());
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index b8f6e54593..630f054e41 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -191,7 +191,7 @@ void MingwMakefileGenerator::writeIncPart(QTextStream &t)
             return;
         }
     }
-    for (const ProString &incit: qAsConst(incs)) {
+    for (const ProString &incit: std::as_const(incs)) {
         QString inc = incit.toQString();
         inc.replace(QRegularExpression("\\\\$"), "");
         inc.replace('\\', '/');
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index bc22ba9c8f..1e21afd1c2 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -264,9 +264,9 @@ QStringList NmakeMakefileGenerator::sourceFilesForImplicitRulesFilter()
 {
     QStringList filter;
     const QChar wildcard = QLatin1Char('*');
-    for (const QString &ext : qAsConst(Option::c_ext))
+    for (const QString &ext : std::as_const(Option::c_ext))
         filter << wildcard + ext;
-    for (const QString &ext : qAsConst(Option::cpp_ext))
+    for (const QString &ext : std::as_const(Option::cpp_ext))
         filter << wildcard + ext;
     return filter;
 }
@@ -314,7 +314,7 @@ void NmakeMakefileGenerator::writeImplicitRulesPart(QTextStream &t)
         const QStringList sourceFilesFilter = sourceFilesForImplicitRulesFilter();
         QStringList fixifiedSourceDirs = fileFixify(QList<QString>(source_directories.constBegin(), source_directories.constEnd()), FileFixifyAbsolute);
         fixifiedSourceDirs.removeDuplicates();
-        for (const QString &sourceDir : qAsConst(fixifiedSourceDirs)) {
+        for (const QString &sourceDir : std::as_const(fixifiedSourceDirs)) {
             QDirIterator dit(sourceDir, sourceFilesFilter, QDir::Files | QDir::NoDotAndDotDot);
             while (dit.hasNext()) {
                 const QFileInfo fi = dit.nextFileInfo();
@@ -339,7 +339,7 @@ void NmakeMakefileGenerator::writeImplicitRulesPart(QTextStream &t)
         project->variables().remove("QMAKE_RUN_CXX");
         project->variables().remove("QMAKE_RUN_CC");
 
-        for (const QString &sourceDir : qAsConst(source_directories)) {
+        for (const QString &sourceDir : std::as_const(source_directories)) {
             if (sourceDir.isEmpty())
                 continue;
             QString objDir = var("OBJECTS_DIR");
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 04f2a99ded..660ac24af9 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -2271,7 +2271,7 @@ void VCFilter::modifyPCHstage(QString str)
         lines << "* WARNING: All changes made in this file will be lost.";
         lines << "--------------------------------------------------------------------*/";
         lines << "#include \"" + Project->precompHFilename + "\"";
-        for (const QString &line : qAsConst(lines))
+        for (const QString &line : std::as_const(lines))
             CustomBuildTool.CommandLine += "echo " + line + ">>" + toFile;
         return;
     }
@@ -2461,7 +2461,7 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
 
     // Ensure that none of the output files are also dependencies. Or else, the custom buildstep
     // will be rebuild every time, even if nothing has changed.
-    for (const QString &output : qAsConst(CustomBuildTool.Outputs))
+    for (const QString &output : std::as_const(CustomBuildTool.Outputs))
         CustomBuildTool.AdditionalDependencies.removeAll(output);
 
     useCustomBuildTool = !CustomBuildTool.CommandLine.isEmpty();
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 73dc65e7bf..5dd1532d57 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -349,7 +349,7 @@ ProStringList VcprojGenerator::collectDependencies(QMakeProject *proj, QHash<QSt
         collectedSubdirs.append(qMakePair(tmpdir.toQString(), proj->values(ProKey(tmp_proj_subdirs.at(x) + ".depends"))));
         projLookup.insert(tmp_proj_subdirs.at(x).toQString(), tmpdir.toQString());
     }
-    for (const auto &subdir : qAsConst(collectedSubdirs)) {
+    for (const auto &subdir : std::as_const(collectedSubdirs)) {
         QString profile = subdir.first;
         QFileInfo fi(fileInfo(Option::normalizePath(profile)));
         if (fi.exists()) {