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

diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
index 2e143aff21..69f65ad9ef 100644
--- a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
@@ -210,7 +210,7 @@ struct FieldDef {
         rt.replace(QRegularExpression("\\s"), QString("_"));
         int i = rt.indexOf(QLatin1Char('('));
         if (i == -1)
-            i = rt.length();
+            i = rt.size();
         if (i > 20)
             i = 20;
         return "t_" + rt.left(i);
@@ -1904,13 +1904,13 @@ void tst_QSqlDatabase::odbc_testqGetString()
     QVERIFY_SQL(q, exec("SELECT id, vcvalue FROM " + testqGetString + " ORDER BY id"));
     QVERIFY_SQL(q, next());
     QCOMPARE(q.value(0).toInt(), 1);
-    QCOMPARE(q.value(1).toString().length(), 65536);
+    QCOMPARE(q.value(1).toString().size(), 65536);
     QVERIFY_SQL(q, next());
     QCOMPARE(q.value(0).toInt(), 2);
-    QCOMPARE(q.value(1).toString().length(), 65537);
+    QCOMPARE(q.value(1).toString().size(), 65537);
     QVERIFY_SQL(q, next());
     QCOMPARE(q.value(0).toInt(), 3);
-    QCOMPARE(q.value(1).toString().length(), 65538);
+    QCOMPARE(q.value(1).toString().size(), 65538);
 }
 
 
diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
index 28e3a20f4d..b4ad75286b 100644
--- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
+++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
@@ -3594,9 +3594,9 @@ void tst_QSqlQuery::task_250026()
     QVERIFY_SQL(q, exec());
     QVERIFY_SQL(q, exec("select * from " + tableName));
     QVERIFY_SQL(q, next());
-    QCOMPARE(q.value(0).toString().length(), data258.length());
+    QCOMPARE(q.value(0).toString().size(), data258.size());
     QVERIFY_SQL(q, next());
-    QCOMPARE(q.value(0).toString().length(), data1026.length());
+    QCOMPARE(q.value(0).toString().size(), data1026.size());
 }
 
 void tst_QSqlQuery::crashQueryOnCloseDatabase()
diff --git a/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp b/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp
index b8fd27bc50..6ef3ad4d19 100644
--- a/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp
+++ b/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp
@@ -29,7 +29,7 @@ void tst_QSqlResult::positionalToNamedBinding()
     TestSqlDriverResult result(&testDriver);
     QString query("INSERT INTO MYTABLE (ID, NAME, BIRTH) VALUES(?, ?, ?)");
     QVERIFY(result.savePrepare(query));
-    QCOMPARE(result.boundValues().count(), 3);
+    QCOMPARE(result.boundValues().size(), 3);
 }
 
 void tst_QSqlResult::parseOfBoundValues()
@@ -37,43 +37,43 @@ void tst_QSqlResult::parseOfBoundValues()
     TestSqlDriver testDriver;
     TestSqlDriverResult result(&testDriver);
     QVERIFY(result.savePrepare("SELECT :1 AS \":2\""));
-    QCOMPARE(result.boundValues().count(), 1);
+    QCOMPARE(result.boundValues().size(), 1);
     QVERIFY(result.savePrepare("SELECT :1 AS ':2'"));
-    QCOMPARE(result.boundValues().count(), 1);
+    QCOMPARE(result.boundValues().size(), 1);
     QVERIFY(result.savePrepare("SELECT :1 AS [:2]"));
     if (testDriver.dbmsType() == QSqlDriver::PostgreSQL)
-        QCOMPARE(result.boundValues().count(), 2);
+        QCOMPARE(result.boundValues().size(), 2);
     else
-        QCOMPARE(result.boundValues().count(), 1);
+        QCOMPARE(result.boundValues().size(), 1);
     QVERIFY(result.savePrepare("SELECT :1 AS [:2]]]"));
     if (testDriver.dbmsType() == QSqlDriver::PostgreSQL)
-        QCOMPARE(result.boundValues().count(), 2);
+        QCOMPARE(result.boundValues().size(), 2);
     else
-        QCOMPARE(result.boundValues().count(), 1);
+        QCOMPARE(result.boundValues().size(), 1);
     QVERIFY(result.savePrepare("SELECT :1 AS [:2]]]]]"));
     if (testDriver.dbmsType() == QSqlDriver::PostgreSQL)
-        QCOMPARE(result.boundValues().count(), 2);
+        QCOMPARE(result.boundValues().size(), 2);
     else
-        QCOMPARE(result.boundValues().count(), 1);
+        QCOMPARE(result.boundValues().size(), 1);
 
     QVERIFY(result.savePrepare("SELECT ? AS \"?\""));
-    QCOMPARE(result.boundValues().count(), 1);
+    QCOMPARE(result.boundValues().size(), 1);
     QVERIFY(result.savePrepare("SELECT ? AS '?'"));
-    QCOMPARE(result.boundValues().count(), 1);
+    QCOMPARE(result.boundValues().size(), 1);
     QVERIFY(result.savePrepare("SELECT ? AS [?]"));
     if (testDriver.dbmsType() == QSqlDriver::PostgreSQL)
-        QCOMPARE(result.boundValues().count(), 2);
+        QCOMPARE(result.boundValues().size(), 2);
     else
-        QCOMPARE(result.boundValues().count(), 1);
+        QCOMPARE(result.boundValues().size(), 1);
 
     QVERIFY(result.savePrepare("SELECT ? AS \"'?\""));
-    QCOMPARE(result.boundValues().count(), 1);
+    QCOMPARE(result.boundValues().size(), 1);
     QVERIFY(result.savePrepare("SELECT ? AS '?\"'"));
-    QCOMPARE(result.boundValues().count(), 1);
+    QCOMPARE(result.boundValues().size(), 1);
     QVERIFY(result.savePrepare("SELECT ? AS '?''?'"));
-    QCOMPARE(result.boundValues().count(), 1);
+    QCOMPARE(result.boundValues().size(), 1);
     QVERIFY(result.savePrepare("SELECT ? AS [\"?']"));
-    QCOMPARE(result.boundValues().count(), 1);
+    QCOMPARE(result.boundValues().size(), 1);
 }
 
 QTEST_MAIN( tst_QSqlResult )
diff --git a/tests/auto/sql/models/qsqlrelationaldelegate/tst_qsqlrelationaldelegate.cpp b/tests/auto/sql/models/qsqlrelationaldelegate/tst_qsqlrelationaldelegate.cpp
index 5c49600b8f..1a9f8310c9 100644
--- a/tests/auto/sql/models/qsqlrelationaldelegate/tst_qsqlrelationaldelegate.cpp
+++ b/tests/auto/sql/models/qsqlrelationaldelegate/tst_qsqlrelationaldelegate.cpp
@@ -146,7 +146,7 @@ void tst_QSqlRelationalDelegate::comboBoxEditor()
     tv.setCurrentIndex(index);
     tv.edit(index);
     QList<QComboBox*> comboBoxes = tv.viewport()->findChildren<QComboBox *>();
-    QCOMPARE(comboBoxes.count(), 1);
+    QCOMPARE(comboBoxes.size(), 1);
 
     QComboBox *editor = comboBoxes.at(0);
     QCOMPARE(editor->currentText(), "herr");
diff --git a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
index ebddefb5fd..974a365b7e 100644
--- a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
+++ b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
@@ -603,7 +603,7 @@ void tst_QSqlTableModel::setRecord()
             // dataChanged() emitted by setData() for each *changed* column
             if ((QSqlTableModel::EditStrategy)submitpolicy == QSqlTableModel::OnManualSubmit) {
                 QCOMPARE(spy.count(), 2);
-                QCOMPARE(spy.at(0).count(), 2);
+                QCOMPARE(spy.at(0).size(), 2);
                 QCOMPARE(qvariant_cast<QModelIndex>(spy.at(0).at(0)), model.index(i, 1));
                 QCOMPARE(qvariant_cast<QModelIndex>(spy.at(0).at(1)), model.index(i, 1));
                 QCOMPARE(qvariant_cast<QModelIndex>(spy.at(1).at(0)), model.index(i, 2));
@@ -617,7 +617,7 @@ void tst_QSqlTableModel::setRecord()
                     QCOMPARE(spy.count(), 3);
                 else
                     QCOMPARE(spy.count(), 2);
-                QCOMPARE(spy.at(0).count(), 2);
+                QCOMPARE(spy.at(0).size(), 2);
                 QCOMPARE(qvariant_cast<QModelIndex>(spy.at(0).at(0)), model.index(i, 1));
                 QCOMPARE(qvariant_cast<QModelIndex>(spy.at(0).at(1)), model.index(i, 1));
                 QCOMPARE(qvariant_cast<QModelIndex>(spy.at(1).at(0)), model.index(i, 2));