Port from container.count()/length() to size()

This is semantic patch using ClangTidyTransformator:

  auto QtContainerClass = 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'.

<classes> are:

    // sequential:
    "QByteArray",
    "QList",
    "QQueue",
    "QStack",
    "QString",
    "QVarLengthArray",
    "QVector",
    // associative:
    "QHash",
    "QMultiHash",
    "QMap",
    "QMultiMap",
    "QSet",
    // Qt has no QMultiSet

Change-Id: Ibe8837be96e8d30d1846881ecd65180c1bc459af
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

1 files changed, 26 insertions, 26 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp b/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
index c0536419b7..abfc42a2df 100644
--- a/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
@@ -75,13 +75,13 @@ void tst_QGraphicsSceneIndex::scatteredItems()
     for (int i = 0; i < 10; ++i)
         scene.addRect(i*50, i*50, 40, 35);
 
-    QCOMPARE(scene.items(QPointF(5, 5)).count(), 1);
-    QCOMPARE(scene.items(QPointF(55, 55)).count(), 1);
-    QCOMPARE(scene.items(QPointF(-100, -100)).count(), 0);
+    QCOMPARE(scene.items(QPointF(5, 5)).size(), 1);
+    QCOMPARE(scene.items(QPointF(55, 55)).size(), 1);
+    QCOMPARE(scene.items(QPointF(-100, -100)).size(), 0);
 
-    QCOMPARE(scene.items(QRectF(0, 0, 10, 10)).count(), 1);
-    QCOMPARE(scene.items(QRectF(0, 0, 1000, 1000)).count(), 10);
-    QCOMPARE(scene.items(QRectF(-100, -1000, 0, 0)).count(), 0);
+    QCOMPARE(scene.items(QRectF(0, 0, 10, 10)).size(), 1);
+    QCOMPARE(scene.items(QRectF(0, 0, 1000, 1000)).size(), 10);
+    QCOMPARE(scene.items(QRectF(-100, -1000, 0, 0)).size(), 0);
 }
 
 void tst_QGraphicsSceneIndex::overlappedItems_data()
@@ -100,17 +100,17 @@ void tst_QGraphicsSceneIndex::overlappedItems()
         for (int j = 0; j < 10; ++j)
             scene.addRect(i*50, j*50, 200, 200)->setPen(QPen(Qt::black, 0));
 
-    QCOMPARE(scene.items(QPointF(5, 5)).count(), 1);
-    QCOMPARE(scene.items(QPointF(55, 55)).count(), 4);
-    QCOMPARE(scene.items(QPointF(105, 105)).count(), 9);
-    QCOMPARE(scene.items(QPointF(-100, -100)).count(), 0);
-
-    QCOMPARE(scene.items(QRectF(0, 0, 1000, 1000)).count(), 100);
-    QCOMPARE(scene.items(QRectF(-100, -1000, 0, 0)).count(), 0);
-    QCOMPARE(scene.items(QRectF(0, 0, 200, 200)).count(), 16);
-    QCOMPARE(scene.items(QRectF(0, 0, 100, 100)).count(), 4);
-    QCOMPARE(scene.items(QRectF(0, 0, 1, 100)).count(), 2);
-    QCOMPARE(scene.items(QRectF(0, 0, 1, 1000)).count(), 10);
+    QCOMPARE(scene.items(QPointF(5, 5)).size(), 1);
+    QCOMPARE(scene.items(QPointF(55, 55)).size(), 4);
+    QCOMPARE(scene.items(QPointF(105, 105)).size(), 9);
+    QCOMPARE(scene.items(QPointF(-100, -100)).size(), 0);
+
+    QCOMPARE(scene.items(QRectF(0, 0, 1000, 1000)).size(), 100);
+    QCOMPARE(scene.items(QRectF(-100, -1000, 0, 0)).size(), 0);
+    QCOMPARE(scene.items(QRectF(0, 0, 200, 200)).size(), 16);
+    QCOMPARE(scene.items(QRectF(0, 0, 100, 100)).size(), 4);
+    QCOMPARE(scene.items(QRectF(0, 0, 1, 100)).size(), 2);
+    QCOMPARE(scene.items(QRectF(0, 0, 1, 1000)).size(), 10);
 }
 
 void tst_QGraphicsSceneIndex::movingItems_data()
@@ -129,20 +129,20 @@ void tst_QGraphicsSceneIndex::movingItems()
         scene.addRect(i*50, i*50, 40, 35);
 
     QGraphicsRectItem *box = scene.addRect(0, 0, 10, 10);
-    QCOMPARE(scene.items(QPointF(5, 5)).count(), 2);
-    QCOMPARE(scene.items(QPointF(-1, -1)).count(), 0);
-    QCOMPARE(scene.items(QRectF(0, 0, 5, 5)).count(), 2);
+    QCOMPARE(scene.items(QPointF(5, 5)).size(), 2);
+    QCOMPARE(scene.items(QPointF(-1, -1)).size(), 0);
+    QCOMPARE(scene.items(QRectF(0, 0, 5, 5)).size(), 2);
 
     box->setPos(10, 10);
-    QCOMPARE(scene.items(QPointF(9, 9)).count(), 1);
-    QCOMPARE(scene.items(QPointF(15, 15)).count(), 2);
-    QCOMPARE(scene.items(QRectF(0, 0, 1, 1)).count(), 1);
+    QCOMPARE(scene.items(QPointF(9, 9)).size(), 1);
+    QCOMPARE(scene.items(QPointF(15, 15)).size(), 2);
+    QCOMPARE(scene.items(QRectF(0, 0, 1, 1)).size(), 1);
 
     box->setPos(-5, -5);
-    QCOMPARE(scene.items(QPointF(-1, -1)).count(), 1);
-    QCOMPARE(scene.items(QRectF(0, 0, 1, 1)).count(), 2);
+    QCOMPARE(scene.items(QPointF(-1, -1)).size(), 1);
+    QCOMPARE(scene.items(QRectF(0, 0, 1, 1)).size(), 2);
 
-    QCOMPARE(scene.items(QRectF(0, 0, 1000, 1000)).count(), 11);
+    QCOMPARE(scene.items(QRectF(0, 0, 1000, 1000)).size(), 11);
 }
 
 void tst_QGraphicsSceneIndex::connectedToSceneRectChanged()