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>

8 files changed, 53 insertions, 53 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index 2787493916..d009f96c31 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -5683,7 +5683,7 @@ void tst_QGraphicsItem::itemClipsChildrenToShape5()
     }
 
     const QList<QGraphicsItem *> children = parent->childItems();
-    const int childrenCount = children.count();
+    const int childrenCount = children.size();
 
     for (int i = 0; i < 5; ++i) {
         QString clipString;
diff --git a/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
index b5ba1d8787..a0bc43e150 100644
--- a/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
@@ -670,7 +670,7 @@ public:
 
 private slots:
     void valueChanged(qreal value) {
-        for (int i = 0; i < fromGeoms.count(); ++i) {
+        for (int i = 0; i < fromGeoms.size(); ++i) {
             QGraphicsLayoutItem *li = itemAt(i);
             QRectF from = fromGeoms.at(i);
             QRectF to = toGeoms.at(i);
@@ -825,7 +825,7 @@ CustomLayout(QGraphicsLayoutItem *parent)
 
 int count() const override
 {
-    return items.count();
+    return items.size();
 }
 
 QGraphicsLayoutItem* itemAt(int index) const override
@@ -841,12 +841,12 @@ void removeAt(int index) override
 
 void addItem(QGraphicsLayoutItem *item)
 {
-    insertItem(items.count(), item);
+    insertItem(items.size(), item);
 }
 
 void insertItem(int index, QGraphicsLayoutItem *item)
 {
-    index = qBound(0, index, items.count());
+    index = qBound(0, index, items.size());
 
     item->setParentLayoutItem(this);
 
@@ -854,7 +854,7 @@ void insertItem(int index, QGraphicsLayoutItem *item)
     updateParentWidget(widget);
 
 
-    if (index == items.count()) {
+    if (index == items.size()) {
         items.append(item);
     } else {
         items.insert(index, item);
@@ -922,7 +922,7 @@ void tst_QGraphicsLayout::ownership()
 
         destructedSet.clear();
         window->setLayout(0);
-        QCOMPARE(destructedSet.count(), 0);
+        QCOMPARE(destructedSet.size(), 0);
         delete window;
     }
 
diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
index ff625dbc00..83e03b9c58 100644
--- a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
@@ -723,7 +723,7 @@ void tst_QGraphicsLinearLayout::orientation()
     // important to resize to preferredsize when orientation is switched
     widget->resize(widget->effectiveSizeHint(Qt::PreferredSize));
     qApp->processEvents();
-    for (i = 0; i < positions.count(); ++i) {
+    for (i = 0; i < positions.size(); ++i) {
         QGraphicsWidget *item = static_cast<QGraphicsWidget*>(layout.itemAt(i));
         if (initialOrientation == Qt::Horizontal)
             QCOMPARE(item->pos().y(), positions.at(i));
diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
index a2961f9a27..169e90d9c7 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
@@ -2307,7 +2307,7 @@ void tst_QGraphicsProxyWidget::popup_basic()
     box->setGeometry(0, 0, 320, 40);
     box->addItems(QStringList() << "monday" << "tuesday" << "wednesday"
                   << "thursday" << "saturday" << "sunday");
-    QCOMPARE(proxy->childItems().count(), 0);
+    QCOMPARE(proxy->childItems().size(), 0);
     proxy->setWidget(boxGuard.release());
     proxy->show();
     scene.addItem(proxy);
@@ -2324,7 +2324,7 @@ void tst_QGraphicsProxyWidget::popup_basic()
 
     QTRY_COMPARE(box->pos(), QPoint());
 
-    QCOMPARE(proxy->childItems().count(), 1);
+    QCOMPARE(proxy->childItems().size(), 1);
     QGraphicsProxyWidget *child = (QGraphicsProxyWidget*)(proxy->childItems())[0];
     QVERIFY(child->isWidget());
     QVERIFY(child->widget());
@@ -3853,7 +3853,7 @@ void tst_QGraphicsProxyWidget::touchEventPropagation()
         QHash<int, QList<TouchRecord>> records;
         QWidget *mousePressReceiver = nullptr;
 
-        int count(int id = 0) const { return records.value(id).count(); }
+        int count(int id = 0) const { return records.value(id).size(); }
         TouchRecord at(int i, int id = 0) const { return records.value(id).at(i); }
         void clear()
         {
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
index eababdc680..fa72e25baf 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -3664,8 +3664,8 @@ void tst_QGraphicsScene::insertionOrder()
 
     {
         QList<QGraphicsItem*> itemList = scene.items();
-        QCOMPARE(itemList.count(), numItems);
-        for (int i = 0; i < itemList.count(); ++i) {
+        QCOMPARE(itemList.size(), numItems);
+        for (int i = 0; i < itemList.size(); ++i) {
             QCOMPARE(numItems-1-i, itemList.at(i)->data(0).toInt());
         }
     }
@@ -3678,8 +3678,8 @@ void tst_QGraphicsScene::insertionOrder()
 
     {
         QList<QGraphicsItem*> itemList = scene.items();
-        QCOMPARE(itemList.count(), numItems);
-        for (int i = 0; i < itemList.count(); ++i) {
+        QCOMPARE(itemList.size(), numItems);
+        for (int i = 0; i < itemList.size(); ++i) {
             QCOMPARE(numItems-1-i, itemList.at(i)->data(0).toInt());
         }
     }
@@ -4027,7 +4027,7 @@ void tst_QGraphicsScene::polishItems2()
     // added 10 new children. These should be polished in the next
     // event loop iteration.
     const QList<QGraphicsItem *> children = item->childItems();
-    QCOMPARE(children.count(), 10);
+    QCOMPARE(children.size(), 10);
     for (QGraphicsItem *child : children)
         QVERIFY(!static_cast<PolishItem *>(child)->polished);
 
@@ -4606,13 +4606,13 @@ void tst_QGraphicsScene::zeroScale()
     rect1->setScale(0.00000001);
 
     QApplication::processEvents();
-    QTRY_COMPARE(cl.changes.count(), 1);
+    QTRY_COMPARE(cl.changes.size(), 1);
     QGraphicsRectItem *rect2 = new QGraphicsRectItem(-0.0000001, -0.0000001, 0.0000001, 0.0000001);
     rect2->setScale(0.00000001);
     scene.addItem(rect2);
     rect1->setPos(20,20);
     QApplication::processEvents();
-    QTRY_COMPARE(cl.changes.count(), 2);
+    QTRY_COMPARE(cl.changes.size(), 2);
 }
 
 void tst_QGraphicsScene::focusItemChangedSignal()
@@ -4867,11 +4867,11 @@ void tst_QGraphicsScene::clearSelection()
 
     QCOMPARE(spy.count(), 2);
 
-    QCOMPARE(scene.selectedItems().count(), 2);
+    QCOMPARE(scene.selectedItems().size(), 2);
     scene.clearSelection();
     QVERIFY(!regularRect->isSelected());
     QVERIFY(selectedRect->isSelected());
-    QCOMPARE(scene.selectedItems().count(), 1);
+    QCOMPARE(scene.selectedItems().size(), 1);
     QCOMPARE(spy.count(), 3);
 
     delete regularRect;
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()
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index 4965d269a5..749e6c15d5 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -1046,7 +1046,7 @@ void tst_QGraphicsView::rotated_rubberBand()
     sendMousePress(view.viewport(), QPoint(midWidth - 2, 0), Qt::LeftButton);
     sendMouseMove(view.viewport(), QPoint(midWidth + 2, view.viewport()->height()),
                   Qt::LeftButton, Qt::LeftButton);
-    QCOMPARE(scene.selectedItems().count(), dim);
+    QCOMPARE(scene.selectedItems().size(), dim);
     foreach (const QGraphicsItem *item, scene.items()) {
         QCOMPARE(item->isSelected(), item->data(0).toBool());
     }
diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
index 922589ce67..d615f2d6b2 100644
--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -1125,7 +1125,7 @@ void tst_QGraphicsWidget::layout()
     widget.setLayout(layout);
 
     QTRY_COMPARE(widget.layout(), static_cast<QGraphicsLayout*>(layout));
-    for (int i = 0; i < children.count(); ++i) {
+    for (int i = 0; i < children.size(); ++i) {
         SubQGraphicsWidget *item = children[i];
         QCOMPARE(item->parentWidget(), (QGraphicsWidget *)&widget);
         QVERIFY(item->geometry() != QRectF(0, 0, -1, -1));
@@ -1163,7 +1163,7 @@ void tst_QGraphicsWidget::layoutDirection()
     QCOMPARE(widget.testAttribute(Qt::WA_SetLayoutDirection), true);
     view->show();
     QVERIFY(QTest::qWaitForWindowExposed(view.data()));
-    for (int i = 0; i < children.count(); ++i) {
+    for (int i = 0; i < children.size(); ++i) {
         QTRY_COMPARE(children[i]->layoutDirection(), layoutDirection);
         QTRY_COMPARE(children[i]->testAttribute(Qt::WA_SetLayoutDirection), false);
         view->update();
@@ -1401,7 +1401,7 @@ void tst_QGraphicsWidget::setTabOrder()
         QVERIFY(view.viewport()->hasFocus());
 
         int currentItem = 0;
-        while (currentItem < children.count() - 1) {
+        while (currentItem < children.size() - 1) {
             QTest::keyPress(view.viewport(), Qt::Key_Tab);
             ++currentItem;
             QVERIFY(children[currentItem % children.size()]->hasFocus());
@@ -1550,7 +1550,7 @@ void tst_QGraphicsWidget::unsetLayoutDirection()
     widget.setLayoutDirection(layoutDirection);
     widget.unsetLayoutDirection();
     QCOMPARE(widget.testAttribute(Qt::WA_SetLayoutDirection), false);
-    for (int i = 0; i < children.count(); ++i) {
+    for (int i = 0; i < children.size(); ++i) {
         QCOMPARE(children[i]->layoutDirection(), Qt::LeftToRight);
     }
 }
@@ -1909,7 +1909,7 @@ void tst_QGraphicsWidget::setSizes()
     QSizeF max = QSizeF(50, 50);
 
     int i;
-    for (i = 0; i < inputInstructions.count(); ++i) {
+    for (i = 0; i < inputInstructions.size(); ++i) {
         Inst input = inputInstructions.at(i);
 
         // defaults
@@ -1963,7 +1963,7 @@ void tst_QGraphicsWidget::setSizes()
     widget->setPreferredSize(pref);
     widget->setMaximumSize(max);
 
-    for (i = 0; i < compareInstructions.count(); ++i) {
+    for (i = 0; i < compareInstructions.size(); ++i) {
         Inst input = compareInstructions.at(i);
         switch (input.first) {
             case MinimumSize: