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>

5 files changed, 17 insertions, 17 deletions

diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index 4a6bf52d5f..4970dbd64d 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -389,7 +389,7 @@ void tst_QFiledialog::directory()
 
     // Check my way
     QList<QListView*> list = fd.findChildren<QListView*>("listView");
-    QVERIFY(list.count() > 0);
+    QVERIFY(list.size() > 0);
 #ifdef Q_OS_WIN
     QCOMPARE(list.at(0)->rootIndex().data().toString().toLower(), temp.dirName().toLower());
 #else
@@ -663,7 +663,7 @@ void tst_QFiledialog::filters()
 
     // effects
     QList<QComboBox*> views = fd.findChildren<QComboBox*>("fileTypeCombo");
-    QCOMPARE(views.count(), 1);
+    QCOMPARE(views.size(), 1);
     QCOMPARE(views.at(0)->isVisible(), false);
 
     QStringList filters;
@@ -985,13 +985,13 @@ void tst_QFiledialog::viewMode()
 
     // find widgets
     QList<QTreeView*> treeView = fd.findChildren<QTreeView*>("treeView");
-    QCOMPARE(treeView.count(), 1);
+    QCOMPARE(treeView.size(), 1);
     QList<QListView*> listView = fd.findChildren<QListView*>("listView");
-    QCOMPARE(listView.count(), 1);
+    QCOMPARE(listView.size(), 1);
     QList<QToolButton*> listButton = fd.findChildren<QToolButton*>("listModeButton");
-    QCOMPARE(listButton.count(), 1);
+    QCOMPARE(listButton.size(), 1);
     QList<QToolButton*> treeButton = fd.findChildren<QToolButton*>("detailModeButton");
-    QCOMPARE(treeButton.count(), 1);
+    QCOMPARE(treeButton.size(), 1);
 
     // default value
     QCOMPARE(fd.viewMode(), QFileDialog::List);
@@ -1130,7 +1130,7 @@ void tst_QFiledialog::focus()
     QCursor::setPos(fd.geometry().center());
 
     QList<QWidget*> treeView = fd.findChildren<QWidget*>("fileNameEdit");
-    QCOMPARE(treeView.count(), 1);
+    QCOMPARE(treeView.size(), 1);
     QVERIFY(treeView.at(0));
     QTRY_COMPARE(treeView.at(0)->hasFocus(), true);
     QCOMPARE(treeView.at(0)->hasFocus(), true);
diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
index c1429e285b..5a9365ebcd 100644
--- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
@@ -1028,10 +1028,10 @@ public :
     void removeSelection() {
         QList<QModelIndex> idxs = selectionModel()->selectedIndexes();
         QList<QPersistentModelIndex> indexes;
-        for (int i = 0; i < idxs.count(); i++)
+        for (int i = 0; i < idxs.size(); i++)
             indexes.append(idxs.at(i));
 
-        for (int i = 0; i < indexes.count(); ++i)
+        for (int i = 0; i < indexes.size(); ++i)
             if (!indexes.at(i).data(Qt::UserRole + 1).toUrl().path().isEmpty())
                 model()->removeRow(indexes.at(i).row());
     }
@@ -1149,7 +1149,7 @@ void tst_QFileDialog2::task257579_sideBarWithNonCleanUrls()
     QFileDialog fd;
     fd.setSidebarUrls(QList<QUrl>() << QUrl::fromLocalFile(url));
     QSidebar *sidebar = fd.findChild<QSidebar*>("sidebar");
-    QCOMPARE(sidebar->urls().count(), 1);
+    QCOMPARE(sidebar->urls().size(), 1);
     QVERIFY(sidebar->urls().first().toLocalFile() != url);
     QCOMPARE(sidebar->urls().first().toLocalFile(), QDir::cleanPath(url));
 
diff --git a/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp
index 828eaa7214..2ab7293428 100644
--- a/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp
+++ b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp
@@ -215,7 +215,7 @@ void tst_QFontDialog::testNonStandardFontSize()
     QList<int> standardSizesList = QFontDatabase::standardSizes();
     int nonStandardFontSize;
     if (!standardSizesList.isEmpty()) {
-        nonStandardFontSize = standardSizesList.at(standardSizesList.count()-1); // get the maximum standard size.
+        nonStandardFontSize = standardSizesList.at(standardSizesList.size()-1); // get the maximum standard size.
         nonStandardFontSize += 1; // the increment of 1 to mock a non-standard font size.
     } else {
         QSKIP("QFontDatabase::standardSizes() is empty.");
diff --git a/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp b/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp
index c4a2ffa2fd..f4e208fb6c 100644
--- a/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp
+++ b/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp
@@ -38,9 +38,9 @@ void tst_QSidebar::setUrls()
     QCOMPARE(model->rowCount(), 0);
     qsidebar.setUrls(urls);
     QCOMPARE(qsidebar.urls(), urls);
-    QCOMPARE(model->rowCount(), urls.count());
+    QCOMPARE(model->rowCount(), urls.size());
     qsidebar.setUrls(urls);
-    QCOMPARE(model->rowCount(), urls.count());
+    QCOMPARE(model->rowCount(), urls.size());
 }
 
 void tst_QSidebar::selectUrls()
diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
index 8277417c82..7d51a0501e 100644
--- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
+++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
@@ -1695,7 +1695,7 @@ public:
 
     void createTestRows()
     {
-        for (int i = 0; i < combinations.count(); ++i) {
+        for (int i = 0; i < combinations.size(); ++i) {
             QTest::newRow((name.toLatin1() + ", row " + QByteArray::number(i)).constData())
                 << (i == 0) << (type == Equality) << combinations.at(i);
             ++nRows_;
@@ -2131,19 +2131,19 @@ void tst_QWizard::showCurrentPageOnly()
 
     wizard.show();
 
-    QCOMPARE(pages.shown().count(), 1);
+    QCOMPARE(pages.shown().size(), 1);
     QCOMPARE(pages.shown().first(), pages.all().first());
 
     const int steps = 2;
     for (int i = 0; i < steps; ++i)
         wizard.next();
 
-    QCOMPARE(pages.shown().count(), 1);
+    QCOMPARE(pages.shown().size(), 1);
     QCOMPARE(pages.shown().first(), pages.all().at(steps));
 
     wizard.restart();
 
-    QCOMPARE(pages.shown().count(), 1);
+    QCOMPARE(pages.shown().size(), 1);
     QCOMPARE(pages.shown().first(), pages.all().first());
 }