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

diff --git a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
index 6664bb4776..217dfddd2f 100644
--- a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
+++ b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
@@ -3555,7 +3555,7 @@ void tst_QFuture::resultsReadyAt()
 
     QCOMPARE(reported, nExpectedResults);
     QCOMPARE(nExpectedResults, iface.future().resultCount());
-    QCOMPARE(readyCounter.count(), 3);
+    QCOMPARE(readyCounter.size(), 3);
     QCOMPARE(taken, 0b1111);
 }
 
@@ -3925,7 +3925,7 @@ void tst_QFuture::rejectResultOverwrite()
     // in QFutureInterface:
     eventProcessor.enterLoopMSecs(2000);
     QVERIFY(!eventProcessor.timeout());
-    QCOMPARE(resultCounter.count(), 1);
+    QCOMPARE(resultCounter.size(), 1);
     f.resume();
 
     // overwrite with lvalue
@@ -3964,7 +3964,7 @@ void tst_QFuture::rejectResultOverwrite()
     });
     eventProcessor.enterLoopMSecs(2000);
     QVERIFY(!eventProcessor.timeout());
-    QCOMPARE(resultCounter.count(), 1);
+    QCOMPARE(resultCounter.size(), 1);
     f.resume();
     QCOMPARE(f.results(), initResults);
 }
@@ -4003,7 +4003,7 @@ void tst_QFuture::rejectPendingResultOverwrite()
         // in QFutureInterface:
         eventProcessor.enterLoopMSecs(2000);
         QVERIFY(!eventProcessor.timeout());
-        QCOMPARE(resultCounter.count(), 1);
+        QCOMPARE(resultCounter.size(), 1);
         f.resume();
     }
 
@@ -4047,7 +4047,7 @@ void tst_QFuture::rejectPendingResultOverwrite()
         });
         eventProcessor.enterLoopMSecs(2000);
         QVERIFY(!eventProcessor.timeout());
-        QCOMPARE(resultCounter.count(), 1);
+        QCOMPARE(resultCounter.size(), 1);
         f.resume();
     }