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, 3 insertions, 3 deletions

diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 347008fe02..335b72f1fb 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -655,7 +655,7 @@ static void qPrintDataTags(FILE *stream)
 
             // Print all tag combinations:
             if (gTable->dataCount() == 0) {
-                if (localTags.count() == 0) {
+                if (localTags.size() == 0) {
                     // No tags at all, so just print the test function:
                     fprintf(stream, "%s %s\n", currTestMetaObj->className(), slot);
                 } else {
@@ -667,7 +667,7 @@ static void qPrintDataTags(FILE *stream)
                 }
             } else {
                 for (int j = 0; j < gTable->dataCount(); ++j) {
-                    if (localTags.count() == 0) {
+                    if (localTags.size() == 0) {
                         // Only global tags, so print the current one:
                         fprintf(
                             stream, "%s %s __global__ %s\n",
@@ -2431,7 +2431,7 @@ QTest::TestEntryFunction QTest::qGetTestCaseEntryFunction(const QString& name)
 */
 int QTest::qExec(QObject *testObject, const QStringList &arguments)
 {
-    const int argc = arguments.count();
+    const int argc = arguments.size();
     QVarLengthArray<char *> argv(argc);
 
     QList<QByteArray> args;