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

diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index 123aa84bbc..d2d89c0ebf 100644
--- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
+++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
@@ -1511,7 +1511,7 @@ void tst_QWindow::orientation()
 
     QSignalSpy spy(&window, SIGNAL(contentOrientationChanged(Qt::ScreenOrientation)));
     window.reportContentOrientationChange(Qt::LandscapeOrientation);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 }
 
 void tst_QWindow::sizes()
@@ -1530,40 +1530,40 @@ void tst_QWindow::sizes()
     QCOMPARE(window.minimumHeight(), 0);
     QCOMPARE(window.minimumSize(), QSize(10, 0));
     QCOMPARE(window.maximumSize(), oldMaximum);
-    QCOMPARE(minimumWidthSpy.count(), 1);
-    QCOMPARE(minimumHeightSpy.count(), 0);
-    QCOMPARE(maximumWidthSpy.count(), 0);
-    QCOMPARE(maximumHeightSpy.count(), 0);
+    QCOMPARE(minimumWidthSpy.size(), 1);
+    QCOMPARE(minimumHeightSpy.size(), 0);
+    QCOMPARE(maximumWidthSpy.size(), 0);
+    QCOMPARE(maximumHeightSpy.size(), 0);
 
     window.setMinimumHeight(10);
     QCOMPARE(window.minimumWidth(), 10);
     QCOMPARE(window.minimumHeight(), 10);
     QCOMPARE(window.minimumSize(), QSize(10, 10));
     QCOMPARE(window.maximumSize(), oldMaximum);
-    QCOMPARE(minimumWidthSpy.count(), 1);
-    QCOMPARE(minimumHeightSpy.count(), 1);
-    QCOMPARE(maximumWidthSpy.count(), 0);
-    QCOMPARE(maximumHeightSpy.count(), 0);
+    QCOMPARE(minimumWidthSpy.size(), 1);
+    QCOMPARE(minimumHeightSpy.size(), 1);
+    QCOMPARE(maximumWidthSpy.size(), 0);
+    QCOMPARE(maximumHeightSpy.size(), 0);
 
     window.setMaximumWidth(100);
     QCOMPARE(window.maximumWidth(), 100);
     QCOMPARE(window.maximumHeight(), oldMaximum.height());
     QCOMPARE(window.minimumSize(), QSize(10, 10));
     QCOMPARE(window.maximumSize(), QSize(100, oldMaximum.height()));
-    QCOMPARE(minimumWidthSpy.count(), 1);
-    QCOMPARE(minimumHeightSpy.count(), 1);
-    QCOMPARE(maximumWidthSpy.count(), 1);
-    QCOMPARE(maximumHeightSpy.count(), 0);
+    QCOMPARE(minimumWidthSpy.size(), 1);
+    QCOMPARE(minimumHeightSpy.size(), 1);
+    QCOMPARE(maximumWidthSpy.size(), 1);
+    QCOMPARE(maximumHeightSpy.size(), 0);
 
     window.setMaximumHeight(100);
     QCOMPARE(window.maximumWidth(), 100);
     QCOMPARE(window.maximumHeight(), 100);
     QCOMPARE(window.minimumSize(), QSize(10, 10));
     QCOMPARE(window.maximumSize(), QSize(100, 100));
-    QCOMPARE(minimumWidthSpy.count(), 1);
-    QCOMPARE(minimumHeightSpy.count(), 1);
-    QCOMPARE(maximumWidthSpy.count(), 1);
-    QCOMPARE(maximumHeightSpy.count(), 1);
+    QCOMPARE(minimumWidthSpy.size(), 1);
+    QCOMPARE(minimumHeightSpy.size(), 1);
+    QCOMPARE(maximumWidthSpy.size(), 1);
+    QCOMPARE(maximumHeightSpy.size(), 1);
 
     // test if min and max limits will change the size
     QVERIFY(window.minimumWidth() < 50 && window.maximumWidth() > 80);
@@ -1806,25 +1806,25 @@ void tst_QWindow::windowModality()
     QCOMPARE(window.modality(), Qt::NonModal);
     window.setModality(Qt::NonModal);
     QCOMPARE(window.modality(), Qt::NonModal);
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
 
     window.setModality(Qt::WindowModal);
     QCOMPARE(window.modality(), Qt::WindowModal);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     window.setModality(Qt::WindowModal);
     QCOMPARE(window.modality(), Qt::WindowModal);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     window.setModality(Qt::ApplicationModal);
     QCOMPARE(window.modality(), Qt::ApplicationModal);
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
     window.setModality(Qt::ApplicationModal);
     QCOMPARE(window.modality(), Qt::ApplicationModal);
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
 
     window.setModality(Qt::NonModal);
     QCOMPARE(window.modality(), Qt::NonModal);
-    QCOMPARE(spy.count(), 3);
+    QCOMPARE(spy.size(), 3);
 }
 
 void tst_QWindow::inputReentrancy()
@@ -2007,32 +2007,32 @@ void tst_QWindow::visibility()
     QVERIFY(window.isVisible());
     QVERIFY(window.visibility() != QWindow::Hidden);
     QVERIFY(window.visibility() != QWindow::AutomaticVisibility);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     spy.clear();
 
     window.setVisibility(QWindow::Hidden);
     QVERIFY(!window.isVisible());
     QCOMPARE(window.visibility(), QWindow::Hidden);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     spy.clear();
 
     window.setVisibility(QWindow::FullScreen);
     QVERIFY(window.isVisible());
     QCOMPARE(window.windowState(), Qt::WindowFullScreen);
     QCOMPARE(window.visibility(), QWindow::FullScreen);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QTRY_COMPARE(window.lastReceivedWindowState, Qt::WindowFullScreen);
     spy.clear();
 
     window.setWindowState(Qt::WindowNoState);
     QCOMPARE(window.visibility(), QWindow::Windowed);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QTRY_COMPARE(window.lastReceivedWindowState, Qt::WindowNoState);
     spy.clear();
 
     window.setVisible(false);
     QCOMPARE(window.visibility(), QWindow::Hidden);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     spy.clear();
 }