Port from container::count() and length() to size() - V5

This is a semantic patch using ClangTidyTransformator as in
qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8, but extended to
handle typedefs and accesses through pointers, too:

    const std::string o = "object";

    auto hasTypeIgnoringPointer = [](auto type) { return anyOf(hasType(type), hasType(pointsTo(type))); };

    auto derivedFromAnyOfClasses = [&](ArrayRef<StringRef> classes) {
        auto exprOfDeclaredType = [&](auto decl) {
            return expr(hasTypeIgnoringPointer(hasUnqualifiedDesugaredType(recordType(hasDeclaration(decl))))).bind(o);
        };
        return exprOfDeclaredType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))));
    };

    auto renameMethod = [&] (ArrayRef<StringRef> classes,
                            StringRef from, StringRef to) {
        return makeRule(cxxMemberCallExpr(on(derivedFromAnyOfClasses(classes)),
                            callee(cxxMethodDecl(hasName(from), parameterCountIs(0)))),
                        changeTo(cat(access(o, cat(to)), "()")),
                        cat("use '", to, "' instead of '", from, "'"));
    };

    renameMethod(<classes>, "count", "size");
    renameMethod(<classes>, "length", "size");

except that the on() matcher has been replaced by one that doesn't
ignoreParens().

a.k.a qt-port-to-std-compatible-api V5 with config Scope: 'Container'.

Added two NOLINTNEXTLINEs in tst_qbitarray and tst_qcontiguouscache,
to avoid porting calls that explicitly test count().

Change-Id: Icfb8808c2ff4a30187e9935a51cad26987451c22
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

5 files changed, 32 insertions, 32 deletions

diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 630f054e41..7f798a2cc6 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -250,7 +250,7 @@ void MingwMakefileGenerator::writeBuildRulesPart(QTextStream &t)
     if(project->isActiveConfig("staticlib") && project->first("TEMPLATE") == "lib") {
         t << "\n\t-$(DEL_FILE) $(DESTDIR_TARGET) 2>" << var("QMAKE_SHELL_NULL_DEVICE");
         const ProString &objmax = project->first("QMAKE_LINK_OBJECT_MAX");
-        if (objmax.isEmpty() || project->values("OBJECTS").count() < objmax.toInt()) {
+        if (objmax.isEmpty() || project->values("OBJECTS").size() < objmax.toInt()) {
             t << "\n\t$(LIB) $(DESTDIR_TARGET) " << objectsLinkLine << " " ;
         } else {
             t << "\n\t" << objectsLinkLine << " " ;
@@ -273,7 +273,7 @@ void MingwMakefileGenerator::writeRcFilePart(QTextStream &t)
     ProStringList rcIncPaths = project->values("RC_INCLUDEPATH");
     rcIncPaths.prepend(fileInfo(rc_file).path());
     QString incPathStr;
-    for (int i = 0; i < rcIncPaths.count(); ++i) {
+    for (int i = 0; i < rcIncPaths.size(); ++i) {
         const ProString &path = rcIncPaths.at(i);
         if (path.isEmpty())
             continue;
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp
index ce4a80b6c8..7cbb44dde4 100644
--- a/qmake/generators/win32/msbuild_objectmodel.cpp
+++ b/qmake/generators/win32/msbuild_objectmodel.cpp
@@ -283,7 +283,7 @@ static QString commandLinesForOutput(QStringList commands)
     // As we want every sub-command to be error-checked (as is done by makefile-based
     // backends), we insert the checks ourselves, using the undocumented jump target.
     static QString errchk = QStringLiteral("if errorlevel 1 goto VCEnd");
-    for (int i = commands.count() - 2; i >= 0; --i) {
+    for (int i = commands.size() - 2; i >= 0; --i) {
         if (!commands.at(i).startsWith("rem", Qt::CaseInsensitive))
             commands.insert(i + 1, errchk);
     }
@@ -301,7 +301,7 @@ static QStringList unquote(const QStringList &values)
 {
     QStringList result;
     result.reserve(values.size());
-    for (int i = 0; i < values.count(); ++i)
+    for (int i = 0; i < values.size(); ++i)
         result << unquote(values.at(i));
     return result;
 }
@@ -544,7 +544,7 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProjectSingleConfig &tool)
                    [] (const VCFilter &filter) { return filter.Name; });
     tempProj.ExtraCompilers.removeDuplicates();
 
-    for (int x = 0; x < tempProj.ExtraCompilers.count(); ++x)
+    for (int x = 0; x < tempProj.ExtraCompilers.size(); ++x)
         addFilters(tempProj, xmlFilter, tempProj.ExtraCompilers.at(x));
 
     xmlFilter << closetag();
@@ -559,7 +559,7 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProjectSingleConfig &tool)
     outputFilter(tempProj, xml, xmlFilter, "Deployment Files");
     outputFilter(tempProj, xml, xmlFilter, "Distribution Files");
 
-    for (int x = 0; x < tempProj.ExtraCompilers.count(); ++x) {
+    for (int x = 0; x < tempProj.ExtraCompilers.size(); ++x) {
         outputFilter(tempProj, xml, xmlFilter, tempProj.ExtraCompilers.at(x));
     }
 
@@ -774,7 +774,7 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool)
     addFilters(tool, xmlFilter, "Deployment Files");
     addFilters(tool, xmlFilter, "Distribution Files");
 
-    for (int x = 0; x < tool.ExtraCompilers.count(); ++x)
+    for (int x = 0; x < tool.ExtraCompilers.size(); ++x)
         addFilters(tool, xmlFilter, tool.ExtraCompilers.at(x));
 
     xmlFilter << closetag();
@@ -788,7 +788,7 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool)
     outputFilter(tool, xml, xmlFilter, "Resource Files");
     outputFilter(tool, xml, xmlFilter, "Deployment Files");
     outputFilter(tool, xml, xmlFilter, "Distribution Files");
-    for (int x = 0; x < tool.ExtraCompilers.count(); ++x) {
+    for (int x = 0; x < tool.ExtraCompilers.size(); ++x) {
         outputFilter(tool, xml, xmlFilter, tool.ExtraCompilers.at(x));
     }
     outputFilter(tool, xml, xmlFilter, "Root Files");
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 660ac24af9..5878686828 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -1539,7 +1539,7 @@ bool VCLinkerTool::parseOption(const char* option)
         {
             QStringList both = QString(option+6).split(",");
             HeapReserveSize = both[0].toLongLong();
-            if(both.count() == 2)
+            if(both.size() == 2)
                 HeapCommitSize = both[1].toLongLong();
         }
         break;
@@ -1728,7 +1728,7 @@ bool VCLinkerTool::parseOption(const char* option)
         {
             QStringList both = QString(option+7).split(",");
             StackReserveSize = both[0].toLongLong();
-            if(both.count() == 2)
+            if(both.size() == 2)
                 StackCommitSize = both[1].toLongLong();
         }
         break;
@@ -2231,13 +2231,13 @@ void VCFilter::addFile(const VCFilterFile& fileInfo)
 
 void VCFilter::addFiles(const QStringList& fileList)
 {
-    for (int i = 0; i < fileList.count(); ++i)
+    for (int i = 0; i < fileList.size(); ++i)
         addFile(fileList.at(i));
 }
 
 void VCFilter::addFiles(const ProStringList& fileList)
 {
-    for (int i = 0; i < fileList.count(); ++i)
+    for (int i = 0; i < fileList.size(); ++i)
         addFile(fileList.at(i).toQString());
 }
 
@@ -2342,7 +2342,7 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
     CustomBuildTool.ToolPath.clear();
     CustomBuildTool.ToolName = QLatin1String(_VCCustomBuildTool);
 
-    for (int x = 0; x < extraCompilers.count(); ++x) {
+    for (int x = 0; x < extraCompilers.size(); ++x) {
         const QString &extraCompilerName = extraCompilers.at(x);
 
         if (!Project->verifyExtraCompiler(extraCompilerName, inFile) && !hasBuiltIn)
@@ -2387,7 +2387,7 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
                                                     configs.contains("dep_existing_only"),
                                                     true  /* checkCommandAvailability */);
         }
-        for (int i = 0; i < deps.count(); ++i)
+        for (int i = 0; i < deps.size(); ++i)
             deps[i] = Option::fixPathToTargetOS(
                         Project->replaceExtraCompilerVariables(
                                 deps.at(i), inFile, out, MakefileGenerator::NoShell),
@@ -2396,9 +2396,9 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
         if (combined) {
             // Add dependencies for each file
             const ProStringList &tmp_in = Project->project->values(ProKey(extraCompilerName + ".input"));
-            for (int a = 0; a < tmp_in.count(); ++a) {
+            for (int a = 0; a < tmp_in.size(); ++a) {
                 const ProStringList &files = Project->project->values(tmp_in.at(a).toKey());
-                for (int b = 0; b < files.count(); ++b) {
+                for (int b = 0; b < files.size(); ++b) {
                     QString file = files.at(b).toQString();
                     deps += Project->findDependencies(file);
                     inputs += Option::fixPathToTargetOS(file, false);
@@ -2432,7 +2432,7 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
         }
 
         // Fixify paths
-        for (int i = 0; i < deps.count(); ++i)
+        for (int i = 0; i < deps.size(); ++i)
             deps[i] = Option::fixPathToTargetOS(deps[i], false);
 
 
@@ -2450,7 +2450,7 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
         deps += CustomBuildTool.AdditionalDependencies;
         // Make sure that all deps are only once
         QStringList uniqDeps;
-        for (int c = 0; c < deps.count(); ++c) {
+        for (int c = 0; c < deps.size(); ++c) {
             QString aDep = deps.at(c);
             if (!aDep.isEmpty())
                 uniqDeps << aDep;
@@ -2496,7 +2496,7 @@ const VCFilter &VCProjectSingleConfig::filterByName(const QString &name) const
 
 const VCFilter &VCProjectSingleConfig::filterForExtraCompiler(const QString &compilerName) const
 {
-    for (int i = 0; i < ExtraCompilersFiles.count(); ++i)
+    for (int i = 0; i < ExtraCompilersFiles.size(); ++i)
         if (ExtraCompilersFiles.at(i).Name == compilerName)
             return ExtraCompilersFiles.at(i);
 
@@ -2576,7 +2576,7 @@ void VCProjectWriter::write(XmlOutput &xml, VCProjectSingleConfig &tool)
     outputFilter(tempProj, xml, "Distribution Files");
 
     QSet<QString> extraCompilersInProject;
-    for (int i = 0; i < tool.ExtraCompilersFiles.count(); ++i) {
+    for (int i = 0; i < tool.ExtraCompilersFiles.size(); ++i) {
         const QString &compilerName = tool.ExtraCompilersFiles.at(i).Name;
         if (!extraCompilersInProject.contains(compilerName)) {
             extraCompilersInProject += compilerName;
@@ -2584,7 +2584,7 @@ void VCProjectWriter::write(XmlOutput &xml, VCProjectSingleConfig &tool)
         }
     }
 
-    for (int x = 0; x < tempProj.ExtraCompilers.count(); ++x) {
+    for (int x = 0; x < tempProj.ExtraCompilers.size(); ++x) {
         outputFilter(tempProj, xml, tempProj.ExtraCompilers.at(x));
     }
     outputFilter(tempProj, xml, "Root Files");
@@ -2628,7 +2628,7 @@ void VCProjectWriter::write(XmlOutput &xml, VCProject &tool)
     outputFilter(tool, xml, "Resource Files");
     outputFilter(tool, xml, "Deployment Files");
     outputFilter(tool, xml, "Distribution Files");
-    for (int x = 0; x < tool.ExtraCompilers.count(); ++x) {
+    for (int x = 0; x < tool.ExtraCompilers.size(); ++x) {
         outputFilter(tool, xml, tool.ExtraCompilers.at(x));
     }
     outputFilter(tool, xml, "Root Files");
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 5dd1532d57..ac50253a44 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -152,7 +152,7 @@ bool VcprojGenerator::writeProjectMakefile()
         for (int i = 0; i < mergedProjects.size(); ++i) {
             VCProjectSingleConfig *singleProject = &(mergedProjects.at(i)->vcProject);
             mergedProject.SingleProjects += *singleProject;
-            for (int j = 0; j < singleProject->ExtraCompilersFiles.count(); ++j) {
+            for (int j = 0; j < singleProject->ExtraCompilersFiles.size(); ++j) {
                 const QString &compilerName = singleProject->ExtraCompilersFiles.at(j).Name;
                 if (!mergedProject.ExtraCompilers.contains(compilerName))
                     mergedProject.ExtraCompilers += compilerName;
@@ -634,10 +634,10 @@ void VcprojGenerator::writeSubDirs(QTextStream &t)
 bool VcprojGenerator::hasBuiltinCompiler(const QString &file)
 {
     // Source files
-    for (int i = 0; i < Option::cpp_ext.count(); ++i)
+    for (int i = 0; i < Option::cpp_ext.size(); ++i)
         if (file.endsWith(Option::cpp_ext.at(i)))
             return true;
-    for (int i = 0; i < Option::c_ext.count(); ++i)
+    for (int i = 0; i < Option::c_ext.size(); ++i)
         if (file.endsWith(Option::c_ext.at(i)))
             return true;
     if (file.endsWith(".rc")
@@ -767,8 +767,8 @@ void VcprojGenerator::init()
         if (autogenPrecompSource) {
             precompSource = precompH
                     + (pchIsCFile
-                       ? (Option::c_ext.count() ? Option::c_ext.at(0) : QLatin1String(".c"))
-                       : (Option::cpp_ext.count() ? Option::cpp_ext.at(0) : QLatin1String(".cpp")));
+                       ? (Option::c_ext.size() ? Option::c_ext.at(0) : QLatin1String(".c"))
+                       : (Option::cpp_ext.size() ? Option::cpp_ext.at(0) : QLatin1String(".cpp")));
             project->values("GENERATED_SOURCES") += precompSource;
         } else if (!precompSource.isEmpty()) {
             project->values("SOURCES") += precompSource;
@@ -1553,7 +1553,7 @@ void VcprojGenerator::initExtraCompilerOutputs()
             } else if (!inputVars.isEmpty()) {
                 // One output file per input
                 const ProStringList &tmp_in = project->values(inputVars.first().toKey());
-                for (int i = 0; i < tmp_in.count(); ++i) {
+                for (int i = 0; i < tmp_in.size(); ++i) {
                     const QString &filename = tmp_in.at(i).toQString();
                     if (extraCompilerSources.contains(filename) && !otherFiltersContain(filename))
                         extraCompile.addFile(Option::fixPathToTargetOS(
@@ -1568,7 +1568,7 @@ void VcprojGenerator::initExtraCompilerOutputs()
             for (const ProString &inputVar : inputVars) {
                 if (!otherFilters.contains(inputVar)) {
                     const ProStringList &tmp_in = project->values(inputVar.toKey());
-                    for (int i = 0; i < tmp_in.count(); ++i) {
+                    for (int i = 0; i < tmp_in.size(); ++i) {
                         const QString &filename = tmp_in.at(i).toQString();
                         if (extraCompilerSources.contains(filename) && !otherFiltersContain(filename))
                             extraCompile.addFile(Option::fixPathToTargetOS(
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index 5ae4d095c7..c8317389f5 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -174,9 +174,9 @@ bool Win32MakefileGenerator::processPrlFileBase(QString &origFile, QStringView o
 {
     if (MakefileGenerator::processPrlFileBase(origFile, origName, fixedBase, slashOff))
         return true;
-    for (int off = fixedBase.length(); off > slashOff; off--) {
+    for (int off = fixedBase.size(); off > slashOff; off--) {
         if (!fixedBase.at(off - 1).isDigit()) {
-            if (off != fixedBase.length()) {
+            if (off != fixedBase.size()) {
                 return MakefileGenerator::processPrlFileBase(
                             origFile, origName, fixedBase.left(off), slashOff);
             }
@@ -686,7 +686,7 @@ void Win32MakefileGenerator::writeRcFilePart(QTextStream &t)
 
         const ProStringList rcIncPaths = project->values("RC_INCLUDEPATH");
         QString incPathStr;
-        for (int i = 0; i < rcIncPaths.count(); ++i) {
+        for (int i = 0; i < rcIncPaths.size(); ++i) {
             const ProString &path = rcIncPaths.at(i);
             if (path.isEmpty())
                 continue;