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

diff --git a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
index 708a785920..99b0720eda 100644
--- a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
+++ b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
@@ -70,7 +70,7 @@ void tst_QOpenGLWidget::create()
     QSignalSpy frameSwappedSpy(w.data(), SIGNAL(frameSwapped()));
     w->show();
     QVERIFY(QTest::qWaitForWindowExposed(w.data()));
-    QVERIFY(frameSwappedSpy.count() > 0);
+    QVERIFY(frameSwappedSpy.size() > 0);
 
     QVERIFY(w->isValid());
     QVERIFY(w->context());
@@ -165,7 +165,7 @@ void tst_QOpenGLWidget::createNonTopLevel()
     w.resize(400, 400);
     w.show();
     QVERIFY(QTest::qWaitForWindowExposed(&w));
-    QVERIFY(frameSwappedSpy.count() > 0);
+    QVERIFY(frameSwappedSpy.size() > 0);
 
     QVERIFY(glw->m_resizeCalled);
     glw->m_resizeCalled = false;
@@ -326,7 +326,7 @@ void tst_QOpenGLWidget::reparentTopLevel()
     {
         QSignalSpy frameSwappedSpy(glw1, &QOpenGLWidget::frameSwapped);
         tabWidget.setCurrentIndex(tabWidget.addTab(glw1, "OpenGL widget 1"));
-        QTRY_VERIFY(frameSwappedSpy.count() > 0);
+        QTRY_VERIFY(frameSwappedSpy.size() > 0);
     }
 
     PainterWidget *glw2 = new PainterWidget;
@@ -334,7 +334,7 @@ void tst_QOpenGLWidget::reparentTopLevel()
     {
         QSignalSpy frameSwappedSpy(glw2, &QOpenGLWidget::frameSwapped);
         tabWidget.setCurrentIndex(tabWidget.addTab(glw2, "OpenGL widget 2"));
-        QTRY_VERIFY(frameSwappedSpy.count() > 0);
+        QTRY_VERIFY(frameSwappedSpy.size() > 0);
     }
 
     QImage image = glw2->grabFramebuffer();
@@ -344,7 +344,7 @@ void tst_QOpenGLWidget::reparentTopLevel()
     {
         QSignalSpy frameSwappedSpy(glw1, &QOpenGLWidget::frameSwapped);
         delete glw2;
-        QTRY_VERIFY(frameSwappedSpy.count() > 0);
+        QTRY_VERIFY(frameSwappedSpy.size() > 0);
     }
 
     image = glw1->grabFramebuffer();
@@ -356,7 +356,7 @@ void tst_QOpenGLWidget::reparentTopLevel()
         glw1->setParent(nullptr);
         glw1->show();
         QVERIFY(QTest::qWaitForWindowExposed(glw1));
-        QTRY_VERIFY(frameSwappedSpy.count() > 0);
+        QTRY_VERIFY(frameSwappedSpy.size() > 0);
     }
 
     image = glw1->grabFramebuffer();
@@ -366,7 +366,7 @@ void tst_QOpenGLWidget::reparentTopLevel()
     {
         QSignalSpy frameSwappedSpy(glw1, &QOpenGLWidget::frameSwapped);
         tabWidget.setCurrentIndex(tabWidget.addTab(glw1, "Re-added OpenGL widget 1"));
-        QTRY_VERIFY(frameSwappedSpy.count() > 0);
+        QTRY_VERIFY(frameSwappedSpy.size() > 0);
     }
 
     image = glw1->grabFramebuffer();