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

diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index 5f2ce68918..0a71c0a755 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -3108,57 +3108,57 @@ void tst_QVariant::convertIterables() const
     {
         QStringList list;
         list.append("Hello");
-        QCOMPARE(QVariant::fromValue(list).value<QVariantList>().count(), list.count());
+        QCOMPARE(QVariant::fromValue(list).value<QVariantList>().size(), list.count());
     }
     {
         QByteArrayList list;
         list.append("Hello");
-        QCOMPARE(QVariant::fromValue(list).value<QVariantList>().count(), list.count());
+        QCOMPARE(QVariant::fromValue(list).value<QVariantList>().size(), list.count());
     }
     {
         QVariantList list;
         list.append("World");
-        QCOMPARE(QVariant::fromValue(list).value<QVariantList>().count(), list.count());
+        QCOMPARE(QVariant::fromValue(list).value<QVariantList>().size(), list.count());
     }
     {
         QMap<QString, int> map;
         map.insert("3", 4);
-        QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().count(), map.count());
-        QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().count(), map.count());
+        QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().size(), map.size());
+        QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().size(), map.size());
 
         map.insert("4", 5);
-        QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().count(), map.count());
-        QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().count(), map.count());
+        QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().size(), map.size());
+        QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().size(), map.size());
     }
     {
         QVariantMap map;
         map.insert("3", 4);
-        QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().count(), map.count());
-        QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().count(), map.count());
+        QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().size(), map.count());
+        QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().size(), map.count());
 
         map.insert("4", 5);
-        QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().count(), map.count());
-        QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().count(), map.count());
+        QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().size(), map.count());
+        QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().size(), map.count());
     }
     {
         QHash<QString, int> hash;
         hash.insert("3", 4);
-        QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().count(), hash.count());
-        QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().count(), hash.count());
+        QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().size(), hash.size());
+        QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().size(), hash.size());
 
         hash.insert("4", 5);
-        QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().count(), hash.count());
-        QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().count(), hash.count());
+        QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().size(), hash.size());
+        QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().size(), hash.size());
     }
     {
         QVariantHash hash;
         hash.insert("3", 4);
-        QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().count(), hash.count());
-        QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().count(), hash.count());
+        QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().size(), hash.count());
+        QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().size(), hash.count());
 
         hash.insert("4", 5);
-        QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().count(), hash.count());
-        QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().count(), hash.count());
+        QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().size(), hash.count());
+        QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().size(), hash.count());
     }
 }