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

diff --git a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
index 9c37e0af6d..820c65dd26 100644
--- a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
+++ b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
@@ -542,7 +542,7 @@ void tst_QColumnView::clicked()
     if (sizeof(qreal) != sizeof(double))
         QSKIP("Skipped due to rounding errors");
 
-    for (int i = 0; i < view.createdColumns.count(); ++i) {
+    for (int i = 0; i < view.createdColumns.size(); ++i) {
         QAbstractItemView *column = view.createdColumns.at(i);
         if (column && column->selectionModel() && (column->rootIndex() == m_fakeDirHomeIndex))
                 QVERIFY(column->selectionModel()->selectedIndexes().isEmpty());
@@ -560,7 +560,7 @@ void tst_QColumnView::selectedColumns()
 
     QTest::qWait(ANIMATION_DELAY);
 
-    for (int i = 0; i < view.createdColumns.count(); ++i) {
+    for (int i = 0; i < view.createdColumns.size(); ++i) {
         QAbstractItemView *column = view.createdColumns.at(i);
         if (!column)
             continue;
@@ -591,7 +591,7 @@ void tst_QColumnView::setSelectionModel()
     view.setSelectionModel(selectionModel);
 
     bool found = false;
-    for (int i = 0; i < view.createdColumns.count(); ++i) {
+    for (int i = 0; i < view.createdColumns.size(); ++i) {
         if (view.createdColumns.at(i)->selectionModel() == selectionModel) {
             found = true;
             break;
@@ -659,7 +659,7 @@ void tst_QColumnView::moveGrip()
     topLevel.show();
     QVERIFY(QTest::qWaitForWindowActive(&topLevel));
 
-    int columnNum = view.createdColumns.count() - 2;
+    int columnNum = view.createdColumns.size() - 2;
     QVERIFY(columnNum >= 0);
     const QObjectList list = view.createdColumns[columnNum]->children();
     QColumnViewGrip *grip = nullptr;
@@ -776,7 +776,7 @@ void tst_QColumnView::setPreviewWidget()
 void tst_QColumnView::sizes()
 {
     QColumnView view;
-    QCOMPARE(view.columnWidths().count(), 0);
+    QCOMPARE(view.columnWidths().size(), 0);
 
     const QList<int> newSizes{ 10, 4, 50, 6 };
 
@@ -787,16 +787,16 @@ void tst_QColumnView::sizes()
     view.setModel(&m_fakeDirModel);
     view.setCurrentIndex(m_fakeDirHomeIndex);
 
-    QList<int> postSizes = view.columnWidths().mid(0, newSizes.count());
-    QCOMPARE(postSizes, newSizes.mid(0, postSizes.count()));
+    QList<int> postSizes = view.columnWidths().mid(0, newSizes.size());
+    QCOMPARE(postSizes, newSizes.mid(0, postSizes.size()));
 
-    QVERIFY(view.columnWidths().count() > 1);
+    QVERIFY(view.columnWidths().size() > 1);
     QList<int> smallerSizes{ 6 };
     view.setColumnWidths(smallerSizes);
     QList<int> expectedSizes = newSizes;
     expectedSizes[0] = 6;
-    postSizes = view.columnWidths().mid(0, newSizes.count());
-    QCOMPARE(postSizes, expectedSizes.mid(0, postSizes.count()));
+    postSizes = view.columnWidths().mid(0, newSizes.size());
+    QCOMPARE(postSizes, expectedSizes.mid(0, postSizes.size()));
 }
 
 void tst_QColumnView::rowDelegate()
@@ -806,7 +806,7 @@ void tst_QColumnView::rowDelegate()
     view.setItemDelegateForRow(3, d);
 
     view.setModel(&m_fakeDirModel);
-    for (int i = 0; i < view.createdColumns.count(); ++i) {
+    for (int i = 0; i < view.createdColumns.size(); ++i) {
         QAbstractItemView *column = view.createdColumns.at(i);
         QCOMPARE(column->itemDelegateForRow(3), d);
     }
@@ -956,7 +956,7 @@ void tst_QColumnView::dynamicModelChanges()
     model.appendRow(item);
 
     QVERIFY(QTest::qWaitForWindowExposed(&view)); //let the time for painting to occur
-    QTRY_COMPARE(delegate.paintedIndexes.count(), 1);
+    QTRY_COMPARE(delegate.paintedIndexes.size(), 1);
     QCOMPARE(*delegate.paintedIndexes.begin(), model.index(0,0));
 }