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

diff --git a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
index cbec31c573..d9c6c02d6b 100644
--- a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
+++ b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
@@ -155,11 +155,11 @@ void tst_QAction::alternateShortcuts()
 
         act.setAutoRepeat(true);
         QTest::keyClick(&testWidget, Qt::Key_A, Qt::ControlModifier);
-        QCOMPARE(spy.count(), 1); //act should have been triggered
+        QCOMPARE(spy.size(), 1); //act should have been triggered
 
         act.setAutoRepeat(false);
         QTest::keyClick(&testWidget, Qt::Key_A, Qt::ControlModifier);
-        QCOMPARE(spy.count(), 2); //act should have been triggered a 2nd time
+        QCOMPARE(spy.size(), 2); //act should have been triggered a 2nd time
 
         //end of the scope of the action, it will be destroyed and removed from wid
         //This action should also unregister its shortcuts
@@ -189,12 +189,12 @@ void tst_QAction::keysequence()
         act.setAutoRepeat(true);
         QTest::keySequence(&testWidget, ks);
         QCoreApplication::processEvents();
-        QCOMPARE(spy.count(), 1); // act should have been triggered
+        QCOMPARE(spy.size(), 1); // act should have been triggered
 
         act.setAutoRepeat(false);
         QTest::keySequence(&testWidget, ks);
         QCoreApplication::processEvents();
-        QCOMPARE(spy.count(), 2); //act should have been triggered a 2nd time
+        QCOMPARE(spy.size(), 2); //act should have been triggered a 2nd time
 
         // end of the scope of the action, it will be destroyed and removed from widget
         // This action should also unregister its shortcuts
@@ -230,15 +230,15 @@ void tst_QAction::enabledVisibleInteraction()
     act.setEnabled(true);
     act.setVisible(false);
     QTest::keyClick(&testWidget, Qt::Key_T, Qt::ControlModifier);
-    QCOMPARE(spy.count(), 0); //act is not visible, so don't trigger
+    QCOMPARE(spy.size(), 0); //act is not visible, so don't trigger
     act.setVisible(false);
     act.setEnabled(true);
     QTest::keyClick(&testWidget, Qt::Key_T, Qt::ControlModifier);
-    QCOMPARE(spy.count(), 0); //act is not visible, so don't trigger
+    QCOMPARE(spy.size(), 0); //act is not visible, so don't trigger
     act.setVisible(true);
     act.setEnabled(true);
     QTest::keyClick(&testWidget, Qt::Key_T, Qt::ControlModifier);
-    QCOMPARE(spy.count(), 1); //act is visible and enabled, so trigger
+    QCOMPARE(spy.size(), 1); //act is visible and enabled, so trigger
 }
 
 #endif // QT_CONFIG(shortcut)
@@ -256,12 +256,12 @@ void tst_QAction::task229128TriggeredSignalWhenInActiongroup()
 
     QSignalSpy actionSpy(checkedAction, QOverload<bool>::of(&QAction::triggered));
     QSignalSpy actionGroupSpy(&ag, QOverload<QAction*>::of(&QActionGroup::triggered));
-    QCOMPARE(actionGroupSpy.count(), 0);
-    QCOMPARE(actionSpy.count(), 0);
+    QCOMPARE(actionGroupSpy.size(), 0);
+    QCOMPARE(actionSpy.size(), 0);
     checkedAction->trigger();
     // check that both the group and the action have emitted the signal
-    QCOMPARE(actionGroupSpy.count(), 1);
-    QCOMPARE(actionSpy.count(), 1);
+    QCOMPARE(actionGroupSpy.size(), 1);
+    QCOMPARE(actionSpy.size(), 1);
 }
 
 #if QT_CONFIG(shortcut)
@@ -284,7 +284,7 @@ void tst_QAction::repeat()
     act.setAutoRepeat(true);
     QTest::keyPress(&testWidget, Qt::Key_F);
     QTest::keyRelease(&testWidget, Qt::Key_F);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     spy.clear();
     QTest::keyPress(&testWidget, Qt::Key_F);
@@ -292,7 +292,7 @@ void tst_QAction::repeat()
     QTest::simulateEvent(&testWidget, true, Qt::Key_F, Qt::NoModifier, QString("f"), true);
     QTest::simulateEvent(&testWidget, true, Qt::Key_F, Qt::NoModifier, QString("f"), true);
     QTest::keyRelease(&testWidget, Qt::Key_F);
-    QCOMPARE(spy.count(), 3);
+    QCOMPARE(spy.size(), 3);
 
     spy.clear();
     act.setAutoRepeat(false);
@@ -300,14 +300,14 @@ void tst_QAction::repeat()
     QTest::simulateEvent(&testWidget, true, Qt::Key_F, Qt::NoModifier, QString("f"), true);
     QTest::simulateEvent(&testWidget, true, Qt::Key_F, Qt::NoModifier, QString("f"), true);
     QTest::keyRelease(&testWidget, Qt::Key_F);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     spy.clear();
     act.setAutoRepeat(true);
     QTest::keyPress(&testWidget, Qt::Key_F);
     QTest::simulateEvent(&testWidget, true, Qt::Key_F, Qt::NoModifier, QString("f"), true);
     QTest::keyRelease(&testWidget, Qt::Key_F);
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
 }
 
 void tst_QAction::disableShortcutsWithBlockedWidgets_data()
@@ -357,7 +357,7 @@ void tst_QAction::disableShortcutsWithBlockedWidgets()
 
     QSignalSpy spy(&action, &QAction::triggered);
     QTest::keyPress(&window, Qt::Key_1);
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
 }
 
 class ShortcutOverrideWidget : public QWidget
@@ -395,7 +395,7 @@ void tst_QAction::shortcutFromKeyEvent()
     // shortcut route for us
     QKeyEvent e(QEvent::KeyPress, Qt::Key_1, Qt::NoModifier);
     QApplication::sendEvent(&testWidget, &e);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QCOMPARE(testWidget.shortcutOverrideCount, 1);
 }
 
@@ -434,42 +434,42 @@ void tst_QAction::disableShortcutInMenuAction()
 
     QKeyEvent event(QEvent::KeyPress, Qt::Key_A, Qt::ControlModifier);
     QApplication::sendEvent(&mw, &event);
-    QCOMPARE(spy.count(), ++expectedTriggerCount);
+    QCOMPARE(spy.size(), ++expectedTriggerCount);
 
     testMenu->menuAction()->setProperty(property, false);
     QApplication::sendEvent(&mw, &event);
-    QCOMPARE(spy.count(), expectedTriggerCount);
+    QCOMPARE(spy.size(), expectedTriggerCount);
 
     testMenu->menuAction()->setProperty(property, true);
     QApplication::sendEvent(&mw, &event);
-    QCOMPARE(spy.count(), ++expectedTriggerCount);
+    QCOMPARE(spy.size(), ++expectedTriggerCount);
 
     // If the action lives somewhere else, then keep firing even
     // if the menu has been hidden or disabled.
     toolBar->addAction(testAction);
     QApplication::sendEvent(&mw, &event);
-    QCOMPARE(spy.count(), ++expectedTriggerCount);
+    QCOMPARE(spy.size(), ++expectedTriggerCount);
 
     testMenu->menuAction()->setProperty(property, false);
     QApplication::sendEvent(&mw, &event);
-    QCOMPARE(spy.count(), ++expectedTriggerCount);
+    QCOMPARE(spy.size(), ++expectedTriggerCount);
 
     // unless all other widgets in which the action lives have
     // been hidden...
     toolBar->hide();
     QApplication::sendEvent(&mw, &event);
-    QCOMPARE(spy.count(), expectedTriggerCount);
+    QCOMPARE(spy.size(), expectedTriggerCount);
 
     // ... or disabled
     toolBar->show();
     toolBar->setEnabled(false);
     QApplication::sendEvent(&mw, &event);
-    QCOMPARE(spy.count(), expectedTriggerCount);
+    QCOMPARE(spy.size(), expectedTriggerCount);
 
     // back to normal
     toolBar->setEnabled(true);
     QApplication::sendEvent(&mw, &event);
-    QCOMPARE(spy.count(), ++expectedTriggerCount);
+    QCOMPARE(spy.size(), ++expectedTriggerCount);
 }
 
 #endif // QT_CONFIG(shortcut)