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

diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
index 430e5034af..df26b4c5da 100644
--- a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
+++ b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
@@ -425,8 +425,8 @@ void tst_QDialogButtonBox::testSignalEmissionAfterDelete_QTBUG_45835()
         button->click();
 
         QCOMPARE(buttonBox.buttons().size(), 0);
-        QCOMPARE(buttonClickedSpy.count(), 1);
-        QCOMPARE(buttonBoxAcceptedSpy.count(), 1);
+        QCOMPARE(buttonClickedSpy.size(), 1);
+        QCOMPARE(buttonBoxAcceptedSpy.size(), 1);
     }
 
     {
@@ -448,8 +448,8 @@ void tst_QDialogButtonBox::testSignalEmissionAfterDelete_QTBUG_45835()
         button->click();
 
         QVERIFY(buttonBox.isNull());
-        QCOMPARE(buttonClickedSpy.count(), 1);
-        QCOMPARE(buttonBoxAcceptedSpy.count(), 0);
+        QCOMPARE(buttonClickedSpy.size(), 1);
+        QCOMPARE(buttonBoxAcceptedSpy.size(), 0);
     }
 }
 
@@ -594,13 +594,13 @@ void tst_QDialogButtonBox::testSignals()
     if (clickMe)
         clickMe->click();
 
-    QTRY_COMPARE(clicked2.count(), clicked2Count);
-    if (clicked2.count() > 0)
+    QTRY_COMPARE(clicked2.size(), clicked2Count);
+    if (clicked2.size() > 0)
         QCOMPARE(qvariant_cast<QAbstractButton *>(clicked2.at(0).at(0)), clickMe);
 
-    QTEST(int(accept.count()), "acceptCount");
-    QTEST(int(reject.count()), "rejectCount");
-    QTEST(int(helpRequested.count()), "helpRequestedCount");
+    QTEST(int(accept.size()), "acceptCount");
+    QTEST(int(reject.size()), "rejectCount");
+    QTEST(int(helpRequested.size()), "helpRequestedCount");
 }
 
 void tst_QDialogButtonBox::testSignalOrder()
@@ -756,7 +756,7 @@ void tst_QDialogButtonBox::testRemove()
 
     button->click();
     QTest::qWait(100);
-    QCOMPARE(clicked.count(), 0);
+    QCOMPARE(clicked.size(), 0);
     delete button;
 }
 
@@ -818,7 +818,7 @@ void tst_QDialogButtonBox::task191642_default()
     QVERIFY(QTest::qWaitForWindowActive(&dlg));
     QVERIFY(def->isDefault());
     QTest::keyPress( &dlg, Qt::Key_Enter );
-    QCOMPARE(clicked.count(), 1);
+    QCOMPARE(clicked.size(), 1);
 }
 
 void tst_QDialogButtonBox::testDeletedStandardButton()