Port from container::count() and length() to size()

This is a semantic patch using ClangTidyTransformator as in
qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8:

  auto QtContainerClass = anyOf(
      expr(hasType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))))).bind(o),
      expr(hasType(namedDecl(hasAnyName(<classes>)))).bind(o));
  makeRule(cxxMemberCallExpr(on(QtContainerClass),
                             callee(cxxMethodDecl(hasAnyName({"count", "length"),
                                                  parameterCountIs(0))))),
           changeTo(cat(access(o, cat("size"), "()"))),
           cat("use 'size()' instead of 'count()/length()'"))

a.k.a qt-port-to-std-compatible-api with config Scope: 'Container',
with the extended set of container classes recognized.

Change-Id: Idb1f75dfe2323bd1d9e8b4d58d54f1b4b80c7ed7
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 17 insertions, 17 deletions

diff --git a/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp b/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp
index aeca3f4046..1097c65f02 100644
--- a/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp
+++ b/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp
@@ -124,19 +124,19 @@ void tst_qqmlinstantiator::activeProperty()
     QCOMPARE(instantiator->count(), 0);
     QVERIFY(instantiator->delegate()->isReady());
 
-    QCOMPARE(activeSpy.count(), 0);
-    QCOMPARE(countSpy.count(), 0);
-    QCOMPARE(objectSpy.count(), 0);
-    QCOMPARE(modelSpy.count(), 0);
+    QCOMPARE(activeSpy.size(), 0);
+    QCOMPARE(countSpy.size(), 0);
+    QCOMPARE(objectSpy.size(), 0);
+    QCOMPARE(modelSpy.size(), 0);
 
     instantiator->setActive(true);
     QCOMPARE(instantiator->isActive(), true);
     QCOMPARE(instantiator->count(), 1);
 
-    QCOMPARE(activeSpy.count(), 1);
-    QCOMPARE(countSpy.count(), 1);
-    QCOMPARE(objectSpy.count(), 1);
-    QCOMPARE(modelSpy.count(), 0);
+    QCOMPARE(activeSpy.size(), 1);
+    QCOMPARE(countSpy.size(), 1);
+    QCOMPARE(objectSpy.size(), 1);
+    QCOMPARE(modelSpy.size(), 0);
 
     QObject *object = instantiator->object();
     QVERIFY(object);
@@ -178,18 +178,18 @@ void tst_qqmlinstantiator::intModelChange()
     QSignalSpy modelSpy(instantiator, SIGNAL(modelChanged()));
     QCOMPARE(instantiator->count(), 10);
 
-    QCOMPARE(activeSpy.count(), 0);
-    QCOMPARE(countSpy.count(), 0);
-    QCOMPARE(objectSpy.count(), 0);
-    QCOMPARE(modelSpy.count(), 0);
+    QCOMPARE(activeSpy.size(), 0);
+    QCOMPARE(countSpy.size(), 0);
+    QCOMPARE(objectSpy.size(), 0);
+    QCOMPARE(modelSpy.size(), 0);
 
     instantiator->setModel(QVariant(2));
     QCOMPARE(instantiator->count(), 2);
 
-    QCOMPARE(activeSpy.count(), 0);
-    QCOMPARE(countSpy.count(), 1);
-    QCOMPARE(objectSpy.count(), 2);
-    QCOMPARE(modelSpy.count(), 1);
+    QCOMPARE(activeSpy.size(), 0);
+    QCOMPARE(countSpy.size(), 1);
+    QCOMPARE(objectSpy.size(), 2);
+    QCOMPARE(modelSpy.size(), 1);
 
     for (int i=0; i<2; i++) {
         QObject *object = instantiator->objectAt(i);
@@ -267,7 +267,7 @@ void tst_qqmlinstantiator::handlerWithParent()
     QScopedPointer<QObject> rootObject(component.create());
     QVERIFY(rootObject != nullptr);
     const auto handlers = rootObject->findChildren<QObject *>("pointHandler");
-    QCOMPARE(handlers.count(), 2);
+    QCOMPARE(handlers.size(), 2);
     for (const auto *h : handlers) {
         QCOMPARE(h->parent(), rootObject.data());
     }