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>

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/baseline/shared/paintcommands.cpp b/tests/baseline/shared/paintcommands.cpp
index 4a3de0168b..06c420e471 100644
--- a/tests/baseline/shared/paintcommands.cpp
+++ b/tests/baseline/shared/paintcommands.cpp
@@ -907,7 +907,7 @@ void PaintCommands::command_import(QRegularExpressionMatch re)
 
     if (m_verboseMode) {
         printf(" -(lance) Command buffer now looks like:\n");
-        for (int i = 0; i < m_commands.count(); ++i)
+        for (int i = 0; i < m_commands.size(); ++i)
             printf(" ---> {%s}\n", qPrintable(m_commands.at(i)));
     }
     delete file;
@@ -925,7 +925,7 @@ void PaintCommands::command_begin_block(QRegularExpressionMatch re)
     m_commands[m_currentCommandIndex] = QLatin1String("# begin block (") + blockName + QLatin1Char(')');
     QStringList newBlock;
     int i = m_currentCommandIndex + 1;
-    for (; i < m_commands.count(); ++i) {
+    for (; i < m_commands.size(); ++i) {
         const QString &nextCmd = m_commands.at(i);
         if (nextCmd.startsWith("end_block")) {
             m_commands[i] = QLatin1String("# end block (") + blockName + QLatin1Char(')');
@@ -935,10 +935,10 @@ void PaintCommands::command_begin_block(QRegularExpressionMatch re)
     }
 
     if (m_verboseMode)
-        for (int j = 0; j < newBlock.count(); ++j)
+        for (int j = 0; j < newBlock.size(); ++j)
             printf("      %d: %s\n", j, qPrintable(newBlock.at(j)));
 
-    if (i >= m_commands.count())
+    if (i >= m_commands.size())
         printf(" - Warning! Block doesn't have an 'end_block' marker!\n");
 
     m_blockMap.insert(blockName, newBlock);