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

diff --git a/tests/auto/testlib/qsignalspy/tst_qsignalspy.cpp b/tests/auto/testlib/qsignalspy/tst_qsignalspy.cpp
index 78f0c17762..8b0319679f 100644
--- a/tests/auto/testlib/qsignalspy/tst_qsignalspy.cpp
+++ b/tests/auto/testlib/qsignalspy/tst_qsignalspy.cpp
@@ -79,12 +79,12 @@ void tst_QSignalSpy::spyWithoutArgs()
     QtTestObject obj;
 
     QSignalSpy spy(&obj, SIGNAL(sig0()));
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
 
     emit obj.sig0();
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     emit obj.sig0();
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
 
     QList<QVariant> args = spy.takeFirst();
     QCOMPARE(args.size(), 0);
@@ -96,7 +96,7 @@ void tst_QSignalSpy::spyWithBasicArgs()
     QSignalSpy spy(&obj, SIGNAL(sig1(int,int)));
 
     emit obj.sig1(1, 2);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     QList<QVariant> args = spy.takeFirst();
     QCOMPARE(args.size(), 2);
@@ -124,7 +124,7 @@ void tst_QSignalSpy::spyWithPointers()
     int i2 = 2;
 
     emit obj.sig2(&i1, &i2);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     QList<QVariant> args = spy.takeFirst();
     QCOMPARE(args.size(), 2);
@@ -155,14 +155,14 @@ void tst_QSignalSpy::spyWithBasicQtClasses()
 
     QSignalSpy spy(&obj, SIGNAL(sig(QString)));
     emit obj.sig(QString("bubu"));
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QCOMPARE(spy.at(0).size(), 1);
     QCOMPARE(spy.at(0).at(0).toString(), QString("bubu"));
 
     QSignalSpy spy2(&obj, SIGNAL(sig5(QVariant)));
     QVariant val(45);
     emit obj.sig5(val);
-    QCOMPARE(spy2.count(), 1);
+    QCOMPARE(spy2.size(), 1);
     QCOMPARE(spy2.at(0).size(), 1);
     QCOMPARE(spy2.at(0).at(0), val);
     QCOMPARE(qvariant_cast<QVariant>(spy2.at(0).at(0)), val);
@@ -176,7 +176,7 @@ void tst_QSignalSpy::spyWithQtClasses()
     QSignalSpy spy(&obj, SIGNAL(sig2(QDateTime)));
     QDateTime dt = QDateTime::currentDateTime();
     emit obj.sig2(dt);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QCOMPARE(spy.at(0).size(), 1);
     QCOMPARE(spy.at(0).at(0).typeName(), "QDateTime");
     QCOMPARE(*static_cast<const QDateTime *>(spy.at(0).at(0).constData()), dt);
@@ -248,7 +248,7 @@ void tst_QSignalSpy::wait_signalEmittedTooLate()
     QTimer::singleShot(500, this, SIGNAL(sigFoo()));
     QSignalSpy spy(this, SIGNAL(sigFoo()));
     QVERIFY(!spy.wait(200));
-    QTRY_COMPARE(spy.count(), 1);
+    QTRY_COMPARE(spy.size(), 1);
 }
 
 void tst_QSignalSpy::wait_signalEmittedMultipleTimes()
@@ -257,13 +257,13 @@ void tst_QSignalSpy::wait_signalEmittedMultipleTimes()
     QTimer::singleShot(800, this, SIGNAL(sigFoo()));
     QSignalSpy spy(this, SIGNAL(sigFoo()));
     QVERIFY(spy.wait());
-    QCOMPARE(spy.count(), 1); // we don't wait for the second signal...
+    QCOMPARE(spy.size(), 1); // we don't wait for the second signal...
     QVERIFY(spy.wait());
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
     QVERIFY(!spy.wait(1));
     QTimer::singleShot(10, this, SIGNAL(sigFoo()));
     QVERIFY(spy.wait());
-    QCOMPARE(spy.count(), 3);
+    QCOMPARE(spy.size(), 3);
 }
 
 void tst_QSignalSpy::spyFunctionPointerWithoutArgs()
@@ -271,12 +271,12 @@ void tst_QSignalSpy::spyFunctionPointerWithoutArgs()
     QtTestObject obj;
 
     QSignalSpy spy(&obj, &QtTestObject::sig0);
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
 
     emit obj.sig0();
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     emit obj.sig0();
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
 
     QList<QVariant> args = spy.takeFirst();
     QCOMPARE(args.size(), 0);
@@ -288,7 +288,7 @@ void tst_QSignalSpy::spyFunctionPointerWithBasicArgs()
     QSignalSpy spy(&obj, &QtTestObject::sig1);
 
     emit obj.sig1(1, 2);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     QList<QVariant> args = spy.takeFirst();
     QCOMPARE(args.size(), 2);
@@ -316,7 +316,7 @@ void tst_QSignalSpy::spyFunctionPointerWithPointers()
     int i2 = 2;
 
     emit obj.sig2(&i1, &i2);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     QList<QVariant> args = spy.takeFirst();
     QCOMPARE(args.size(), 2);
@@ -330,14 +330,14 @@ void tst_QSignalSpy::spyFunctionPointerWithBasicQtClasses()
 
     QSignalSpy spy(&obj, &QtTestObject2::sig);
     emit obj.sig(QString("bubu"));
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QCOMPARE(spy.at(0).size(), 1);
     QCOMPARE(spy.at(0).at(0).toString(), QString("bubu"));
 
     QSignalSpy spy2(&obj, &QtTestObject2::sig5);
     QVariant val(45);
     emit obj.sig5(val);
-    QCOMPARE(spy2.count(), 1);
+    QCOMPARE(spy2.size(), 1);
     QCOMPARE(spy2.at(0).size(), 1);
     QCOMPARE(spy2.at(0).at(0), val);
     QCOMPARE(qvariant_cast<QVariant>(spy2.at(0).at(0)), val);
@@ -350,7 +350,7 @@ void tst_QSignalSpy::spyFunctionPointerWithQtClasses()
     QSignalSpy spy(&obj, &QtTestObject2::sig2);
     QDateTime dt = QDateTime::currentDateTime();
     emit obj.sig2(dt);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QCOMPARE(spy.at(0).size(), 1);
     QCOMPARE(spy.at(0).at(0).typeName(), "QDateTime");
     QCOMPARE(*static_cast<const QDateTime *>(spy.at(0).at(0).constData()), dt);
@@ -373,7 +373,7 @@ void tst_QSignalSpy::spyFunctionPointerWithCustomClass()
     {
         QSignalSpy spy(&obj, &QtTestObject2::sig6);
         emit obj.sig6({});
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
         QCOMPARE(spy.at(0).size(), 1);
         QCOMPARE(spy.at(0).at(0).typeName(), "CustomType");
     }
@@ -420,7 +420,7 @@ void tst_QSignalSpy::waitFunctionPointer_signalEmittedTooLate()
     QSignalSpy spy(this, &tst_QSignalSpy::sigFoo);
     QVERIFY(!spy.wait(200));
     QTest::qWait(400);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 }
 
 void tst_QSignalSpy::waitFunctionPointer_signalEmittedMultipleTimes()
@@ -429,13 +429,13 @@ void tst_QSignalSpy::waitFunctionPointer_signalEmittedMultipleTimes()
     QTimer::singleShot(800, this, SIGNAL(sigFoo()));
     QSignalSpy spy(this, &tst_QSignalSpy::sigFoo);
     QVERIFY(spy.wait());
-    QCOMPARE(spy.count(), 1); // we don't wait for the second signal...
+    QCOMPARE(spy.size(), 1); // we don't wait for the second signal...
     QVERIFY(spy.wait());
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
     QVERIFY(!spy.wait(1));
     QTimer::singleShot(10, this, SIGNAL(sigFoo()));
     QVERIFY(spy.wait());
-    QCOMPARE(spy.count(), 3);
+    QCOMPARE(spy.size(), 3);
 }
 
 void tst_QSignalSpy::spyOnMetaMethod()
@@ -454,7 +454,7 @@ void tst_QSignalSpy::spyOnMetaMethod()
     QVERIFY(spy.isValid());
 
     obj.setObjectName("A new object name");
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 }
 
 Q_DECLARE_METATYPE(QMetaMethod);