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/kernel/qcoreapplication/tst_qcoreapplication.cpp b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp
index 8ddca93cb7..46d52c2340 100644
--- a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp
+++ b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp
@@ -175,7 +175,7 @@ void tst_QCoreApplication::argc()
         char *argv[] = { const_cast<char*>(QTest::currentAppName()) };
         TestApplication app(argc, argv);
         QCOMPARE(argc, 1);
-        QCOMPARE(app.arguments().count(), 1);
+        QCOMPARE(app.arguments().size(), 1);
     }
 
     {
@@ -186,7 +186,7 @@ void tst_QCoreApplication::argc()
                          const_cast<char*>("arg3") };
         TestApplication app(argc, argv);
         QCOMPARE(argc, 4);
-        QCOMPARE(app.arguments().count(), 4);
+        QCOMPARE(app.arguments().size(), 4);
     }
 
     {
@@ -194,7 +194,7 @@ void tst_QCoreApplication::argc()
         char **argv = 0;
         TestApplication app(argc, argv);
         QCOMPARE(argc, 0);
-        QCOMPARE(app.arguments().count(), 0);
+        QCOMPARE(app.arguments().size(), 0);
     }
 
     {
@@ -203,7 +203,7 @@ void tst_QCoreApplication::argc()
                          const_cast<char*>("-qmljsdebugger=port:3768,block") };
         TestApplication app(argc, argv);
         QCOMPARE(argc, 1);
-        QCOMPARE(app.arguments().count(), 1);
+        QCOMPARE(app.arguments().size(), 1);
     }
 }
 
@@ -1021,7 +1021,7 @@ void tst_QCoreApplication::addRemoveLibPaths()
     TestApplication app(argc, argv);
 
     // If libraryPaths only contains currentDir, neither will be in libraryPaths now.
-    if (paths.length() != 1 && currentDir != paths[0]) {
+    if (paths.size() != 1 && currentDir != paths[0]) {
         // Check that modifications stay alive across the creation of an application.
         QVERIFY(QCoreApplication::libraryPaths().contains(currentDir));
         QVERIFY(!QCoreApplication::libraryPaths().contains(paths[0]));