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

diff --git a/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp b/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp
index 35b079181b..065310398c 100644
--- a/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp
+++ b/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp
@@ -373,8 +373,8 @@ void tst_QGroupBox::clicked()
     else
         QTest::mouseClick(&testWidget, Qt::LeftButton);
 
-    QTEST(int(spy.count()), "clickedCount");
-    if (spy.count() > 0)
+    QTEST(int(spy.size()), "clickedCount");
+    if (spy.size() > 0)
         QTEST(spy.at(0).at(0).toBool(), "finalCheck");
     QTEST(testWidget.isChecked(), "finalCheck");
 }
@@ -388,9 +388,9 @@ void tst_QGroupBox::toggledVsClicked()
     QSignalSpy clickSpy(&groupBox, SIGNAL(clicked(bool)));
 
     groupBox.setChecked(!groupBox.isChecked());
-    QCOMPARE(clickSpy.count(), 0);
-    QCOMPARE(toggleSpy.count(), 1);
-    if (toggleSpy.count() > 0)
+    QCOMPARE(clickSpy.size(), 0);
+    QCOMPARE(toggleSpy.size(), 1);
+    if (toggleSpy.size() > 0)
         QCOMPARE(toggleSpy.at(0).at(0).toBool(), groupBox.isChecked());
 
     connect(&groupBox, SIGNAL(clicked(bool)), this, SLOT(clickTimestampSlot()));
@@ -403,8 +403,8 @@ void tst_QGroupBox::toggledVsClicked()
                                                   QStyle::SC_GroupBoxCheckBox, &groupBox);
 
     QTest::mouseClick(&groupBox, Qt::LeftButton, {}, rect.center());
-    QCOMPARE(clickSpy.count(), 1);
-    QCOMPARE(toggleSpy.count(), 2);
+    QCOMPARE(clickSpy.size(), 1);
+    QCOMPARE(toggleSpy.size(), 2);
     QVERIFY(toggleTimeStamp < clickTimeStamp);
 }
 
@@ -602,7 +602,7 @@ void tst_QGroupBox::buttonPressKeys()
                                          .value<QList<Qt::Key>>();
     for (int i = 0; i < buttonPressKeys.size(); ++i) {
         QTest::keyClick(&groupBox, buttonPressKeys[i]);
-        QCOMPARE(clickedSpy.length(), i + 1);
+        QCOMPARE(clickedSpy.size(), i + 1);
     }
 }