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

diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index b168dd96c3..753d3f8b8a 100644
--- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -550,7 +550,7 @@ void tst_QSettings::ctor()
         QCOMPARE(settings1.value("alpha/beta/geometry/width").toInt(), 3);
         QCOMPARE(settings1.value("alpha/beta/geometry/height").toInt(), 4);
         QCOMPARE(settings1.value("alpha/gamma/splitter").toInt(), 5);
-        QCOMPARE(settings1.allKeys().count(), 6);
+        QCOMPARE(settings1.allKeys().size(), 6);
 
         QCOMPARE(settings2.value("alpha/beta/geometry").toInt(), -7);
         QCOMPARE(settings2.value("alpha/beta/geometry/x").toInt(), 1);
@@ -558,7 +558,7 @@ void tst_QSettings::ctor()
         QCOMPARE(settings2.value("alpha/beta/geometry/width").toInt(), 3);
         QCOMPARE(settings2.value("alpha/beta/geometry/height").toInt(), 4);
         QCOMPARE(settings2.value("alpha/gamma/splitter").toInt(), 5);
-        QCOMPARE(settings2.allKeys().count(), 6);
+        QCOMPARE(settings2.allKeys().size(), 6);
     }
 
     {
@@ -569,7 +569,7 @@ void tst_QSettings::ctor()
         QCOMPARE(settings1.value("alpha/beta/geometry/width").toInt(), 3);
         QCOMPARE(settings1.value("alpha/beta/geometry/height").toInt(), 4);
         QCOMPARE(settings1.value("alpha/gamma/splitter").toInt(), 5);
-        QCOMPARE(settings1.allKeys().count(), 6);
+        QCOMPARE(settings1.allKeys().size(), 6);
     }
 
     {
@@ -1731,12 +1731,12 @@ void tst_QSettings::sync()
     QCOMPARE(settings2.value("moo/beta/geometry/width").toInt(), 3);
     QCOMPARE(settings2.value("moo/beta/geometry/height").toInt(), 4);
     QCOMPARE(settings2.value("moo/gamma/splitter").toInt(), 5);
-    QCOMPARE(settings2.allKeys().count(), 11);
+    QCOMPARE(settings2.allKeys().size(), 11);
 
     // Now, software.org.ini no longer exists, this is same as another app
     // clearing all settings.
     settings1.sync();
-    QCOMPARE(settings1.allKeys().count(), 0);
+    QCOMPARE(settings1.allKeys().size(), 0);
 
     // Now "some other app" will change software.org.ini
     QVERIFY(QFile::rename((userConfDir + "other.software.org.ini").toLatin1(),
@@ -1754,7 +1754,7 @@ void tst_QSettings::sync()
     QCOMPARE(settings1.value("moo/beta/geometry/width").toInt(), 3);
     QCOMPARE(settings1.value("moo/beta/geometry/height").toInt(), 4);
     QCOMPARE(settings1.value("moo/gamma/splitter").toInt(), 5);
-    QCOMPARE(settings1.allKeys().count(), 11);
+    QCOMPARE(settings1.allKeys().size(), 11);
 }
 
 void tst_QSettings::syncNonWriteableDir()
@@ -2441,17 +2441,17 @@ void tst_QSettings::testArrays()
         QCOMPARE(settings1.value("ene").toInt(), 2);
         QCOMPARE(settings1.value("due").toInt(), 3);
         QCOMPARE(settings1.value("rike").toInt(), 4);
-        QCOMPARE(settings1.allKeys().count(), 3);
+        QCOMPARE(settings1.allKeys().size(), 3);
         settings1.setArrayIndex(1);
         QCOMPARE(settings1.value("ene").toInt(), 5);
         QCOMPARE(settings1.value("due").toInt(), 6);
         QCOMPARE(settings1.value("rike").toInt(), 7);
-        QCOMPARE(settings1.allKeys().count(), 3);
+        QCOMPARE(settings1.allKeys().size(), 3);
         settings1.setArrayIndex(2);
         QCOMPARE(settings1.value("ene").toInt(), 8);
         QCOMPARE(settings1.value("due").toInt(), 9);
         QCOMPARE(settings1.value("rike").toInt(), 10);
-        QCOMPARE(settings1.allKeys().count(), 3);
+        QCOMPARE(settings1.allKeys().size(), 3);
 
         settings1.endArray();
         settings1.endGroup();
@@ -2501,17 +2501,17 @@ void tst_QSettings::testArrays()
         QCOMPARE(settings1.value("ene").toInt(), 2);
         QCOMPARE(settings1.value("due").toInt(), 3);
         QCOMPARE(settings1.value("rike").toInt(), 4);
-        QCOMPARE(settings1.allKeys().count(), 3);
+        QCOMPARE(settings1.allKeys().size(), 3);
         settings1.setArrayIndex(1);
         QCOMPARE(settings1.value("ene").toInt(), 5);
         QCOMPARE(settings1.value("due").toInt(), 6);
         QCOMPARE(settings1.value("rike").toInt(), 7);
-        QCOMPARE(settings1.allKeys().count(), 3);
+        QCOMPARE(settings1.allKeys().size(), 3);
         settings1.setArrayIndex(2);
         QCOMPARE(settings1.value("ene").toInt(), 8);
         QCOMPARE(settings1.value("due").toInt(), 9);
         QCOMPARE(settings1.value("rike").toInt(), 10);
-        QCOMPARE(settings1.allKeys().count(), 3);
+        QCOMPARE(settings1.allKeys().size(), 3);
 
         settings1.endArray();
         settings1.endGroup();