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

diff --git a/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp b/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
index 1ca4d60f10..3bea468e5b 100644
--- a/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
@@ -225,7 +225,7 @@ void tst_QAbstractProxyModel::headerDataInBounds()
 
     QCOMPARE(proxy.rowCount(), 1);
     QCOMPARE(proxy.columnCount(), 5);
-    QCOMPARE(headerDataChangedSpy.count(), 1);
+    QCOMPARE(headerDataChangedSpy.size(), 1);
     QCOMPARE(headerDataChangedSpy[0][0].value<Qt::Orientation>(), Qt::Horizontal);
     QCOMPARE(headerDataChangedSpy[0][1].value<int>(), 0);
     QCOMPARE(headerDataChangedSpy[0][2].value<int>(), 4);
@@ -244,7 +244,7 @@ void tst_QAbstractProxyModel::headerDataInBounds()
                    });
     QCOMPARE(proxy.rowCount(), 2);
     QCOMPARE(proxy.columnCount(), 5);
-    QCOMPARE(headerDataChangedSpy.count(), 1);
+    QCOMPARE(headerDataChangedSpy.size(), 1);
 
     for (int i = 0; i < proxy.columnCount(); ++i) {
         QString expected = QString("Col%1").arg(proxy.columnCount() - i);
@@ -255,7 +255,7 @@ void tst_QAbstractProxyModel::headerDataInBounds()
 
     QCOMPARE(proxy.rowCount(), 1);
     QCOMPARE(proxy.columnCount(), 5);
-    QCOMPARE(headerDataChangedSpy.count(), 1);
+    QCOMPARE(headerDataChangedSpy.size(), 1);
 
     for (int i = 0; i < proxy.columnCount(); ++i) {
         QString expected = QString("Col%1").arg(proxy.columnCount() - i);
@@ -266,7 +266,7 @@ void tst_QAbstractProxyModel::headerDataInBounds()
 
     QCOMPARE(proxy.rowCount(), 0);
     QCOMPARE(proxy.columnCount(), 5);
-    QCOMPARE(headerDataChangedSpy.count(), 2);
+    QCOMPARE(headerDataChangedSpy.size(), 2);
     QCOMPARE(headerDataChangedSpy[1][0].value<Qt::Orientation>(), Qt::Horizontal);
     QCOMPARE(headerDataChangedSpy[1][1].value<int>(), 0);
     QCOMPARE(headerDataChangedSpy[1][2].value<int>(), 4);