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

diff --git a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
index 07ca72a942..c2bcbe73f5 100644
--- a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
+++ b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
@@ -518,24 +518,24 @@ void tst_QAbstractButton::animateClick()
     button.animateClick();
 
     QVERIFY(button.isDown());
-    QCOMPARE(pressedSpy.count(), 1);
-    QCOMPARE(releasedSpy.count(), 0);
-    QCOMPARE(clickedSpy.count(), 0);
+    QCOMPARE(pressedSpy.size(), 1);
+    QCOMPARE(releasedSpy.size(), 0);
+    QCOMPARE(clickedSpy.size(), 0);
     qApp->processEvents(QEventLoop::AllEvents, 10);
     // QAbstractButton starts a 100ms timer which performs the click. If it
     // took more than 100ms to get here, then the button might no longer be down.
     if (elapsed.elapsed() < 100) {
         QVERIFY(button.isDown());
-        QCOMPARE(pressedSpy.count(), 1);
-        QCOMPARE(releasedSpy.count(), 0);
-        QCOMPARE(clickedSpy.count(), 0);
+        QCOMPARE(pressedSpy.size(), 1);
+        QCOMPARE(releasedSpy.size(), 0);
+        QCOMPARE(clickedSpy.size(), 0);
     }
     QTRY_VERIFY(!button.isDown());
     // but once the button has been clicked, it must have taken at least 100ms
     QVERIFY(elapsed.elapsed() >= 100);
-    QCOMPARE(pressedSpy.count(), 1);
-    QCOMPARE(releasedSpy.count(), 1);
-    QCOMPARE(clickedSpy.count(), 1);
+    QCOMPARE(pressedSpy.size(), 1);
+    QCOMPARE(releasedSpy.size(), 1);
+    QCOMPARE(clickedSpy.size(), 1);
 }
 
 #if QT_CONFIG(shortcut)
@@ -558,9 +558,9 @@ void tst_QAbstractButton::shortcutEvents()
 
     QTest::qWait(1000); // ensure animate timer is expired
 
-    QCOMPARE(pressedSpy.count(), 3);
-    QCOMPARE(releasedSpy.count(), 3);
-    QCOMPARE(clickedSpy.count(), 3);
+    QCOMPARE(pressedSpy.size(), 3);
+    QCOMPARE(releasedSpy.size(), 3);
+    QCOMPARE(clickedSpy.size(), 3);
 }
 
 #endif // QT_CONFIG(shortcut)
@@ -602,14 +602,14 @@ void tst_QAbstractButton::mouseReleased() // QTBUG-53244
     QSignalSpy spyRelease(&button, &QAbstractButton::released);
 
     QTest::mousePress(&button, Qt::LeftButton);
-    QCOMPARE(spyPress.count(), 1);
+    QCOMPARE(spyPress.size(), 1);
     QCOMPARE(button.isDown(), true);
-    QCOMPARE(spyRelease.count(), 0);
+    QCOMPARE(spyRelease.size(), 0);
 
     QTest::mouseClick(&button, Qt::RightButton);
-    QCOMPARE(spyPress.count(), 1);
+    QCOMPARE(spyPress.size(), 1);
     QCOMPARE(button.isDown(), true);
-    QCOMPARE(spyRelease.count(), 0);
+    QCOMPARE(spyRelease.size(), 0);
 
     QPointF posOutOfWidget = QPointF(30, 30);
     QMouseEvent me(QEvent::MouseMove,
@@ -619,9 +619,9 @@ void tst_QAbstractButton::mouseReleased() // QTBUG-53244
 
     qApp->sendEvent(&button, &me);
     // should emit released signal once mouse is dragging out of boundary
-    QCOMPARE(spyPress.count(), 1);
+    QCOMPARE(spyPress.size(), 1);
     QCOMPARE(button.isDown(), false);
-    QCOMPARE(spyRelease.count(), 1);
+    QCOMPARE(spyRelease.size(), 1);
 }
 
 #ifdef QT_KEYPAD_NAVIGATION