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/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
index 9c56d9b2d2..665ee75a35 100644
--- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
+++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
@@ -236,7 +236,7 @@ void tst_QFontDatabase::addAppFont()
     QCOMPARE(id, -1);
     return;
 #endif
-    QCOMPARE(fontDbChangedSpy.count(), 1);
+    QCOMPARE(fontDbChangedSpy.size(), 1);
     if (id == -1)
         QSKIP("Skip the test since app fonts are not supported on this system");
 
@@ -245,9 +245,9 @@ void tst_QFontDatabase::addAppFont()
 
     const QStringList newFamilies = QFontDatabase::families();
     QVERIFY(!newFamilies.isEmpty());
-    QVERIFY(newFamilies.count() >= oldFamilies.count());
+    QVERIFY(newFamilies.size() >= oldFamilies.size());
 
-    for (int i = 0; i < addedFamilies.count(); ++i) {
+    for (int i = 0; i < addedFamilies.size(); ++i) {
         QString family = addedFamilies.at(i);
         QVERIFY(newFamilies.contains(family));
         QFont qfont(family);
@@ -256,9 +256,9 @@ void tst_QFontDatabase::addAppFont()
     }
 
     QVERIFY(QFontDatabase::removeApplicationFont(id));
-    QCOMPARE(fontDbChangedSpy.count(), 2);
+    QCOMPARE(fontDbChangedSpy.size(), 2);
 
-    QVERIFY(QFontDatabase::families().count() <= oldFamilies.count());
+    QVERIFY(QFontDatabase::families().size() <= oldFamilies.size());
 }
 
 void tst_QFontDatabase::addTwoAppFontsFromFamily()