From df9d882d41b741fef7c5beeddb0abe9d904443d8 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Fri, 30 Sep 2022 14:09:04 +0200
Subject: 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>
---
 tests/auto/dbus/qdbusmarshall/common.h              |  4 ++--
 tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'tests/auto/dbus/qdbusmarshall')

diff --git a/tests/auto/dbus/qdbusmarshall/common.h b/tests/auto/dbus/qdbusmarshall/common.h
index 6ae3de6676..916370c377 100644
--- a/tests/auto/dbus/qdbusmarshall/common.h
+++ b/tests/auto/dbus/qdbusmarshall/common.h
@@ -334,7 +334,7 @@ bool compare(const QDBusVariant &s1, const QDBusVariant &s2)
 template<typename T>
 bool compare(const QList<T> &l1, const QList<T> &l2)
 {
-    if (l1.count() != l2.count())
+    if (l1.size() != l2.size())
         return false;
 
     typename QList<T>::ConstIterator it1 = l1.constBegin();
@@ -349,7 +349,7 @@ bool compare(const QList<T> &l1, const QList<T> &l2)
 template<typename Key, typename T>
 bool compare(const QMap<Key, T> &m1, const QMap<Key, T> &m2)
 {
-    if (m1.count() != m2.size())
+    if (m1.size() != m2.size())
         return false;
     typename QMap<Key, T>::ConstIterator i1 = m1.constBegin();
     typename QMap<Key, T>::ConstIterator end = m1.constEnd();
diff --git a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp
index 297a97745e..dc55c09f2a 100644
--- a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp
+++ b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp
@@ -757,9 +757,9 @@ void tst_QDBusMarshall::sendBasic()
              qPrintable(reply.errorName() + ": " + reply.errorMessage()));
     //qDebug() << reply;
 
-    QCOMPARE(reply.arguments().count(), msg.arguments().count());
+    QCOMPARE(reply.arguments().size(), msg.arguments().size());
     QTEST(reply.signature(), "sig");
-    for (int i = 0; i < reply.arguments().count(); ++i) {
+    for (int i = 0; i < reply.arguments().size(); ++i) {
         QVERIFY(compare(reply.arguments().at(i), msg.arguments().at(i)));
         //printf("\n! %s\n* %s\n", qPrintable(qDBusArgumentToString(reply.arguments().at(i))), qPrintable(stringResult));
         QCOMPARE(QDBusUtil::argumentToString(reply.arguments().at(i)), stringResult);
@@ -781,9 +781,9 @@ void tst_QDBusMarshall::sendVariant()
     QDBusMessage reply = con.call(msg);
  //   qDebug() << reply;
 
-    QCOMPARE(reply.arguments().count(), msg.arguments().count());
+    QCOMPARE(reply.arguments().size(), msg.arguments().size());
     QCOMPARE(reply.signature(), QString("v"));
-    for (int i = 0; i < reply.arguments().count(); ++i)
+    for (int i = 0; i < reply.arguments().size(); ++i)
         QVERIFY(compare(reply.arguments().at(i), msg.arguments().at(i)));
 }
 
@@ -1205,7 +1205,7 @@ void tst_QDBusMarshall::receiveUnknownType()
         QTestEventLoop::instance().enterLoop(1);
         QVERIFY(!QTestEventLoop::instance().timeout());
         QCOMPARE(spy.list.size(), 1);
-        QCOMPARE(spy.list.at(0).arguments().count(), 1);
+        QCOMPARE(spy.list.at(0).arguments().size(), 1);
         QFETCH(int, receivedTypeId);
         //qDebug() << spy.list.at(0).arguments().at(0).typeName();
         QCOMPARE(spy.list.at(0).arguments().at(0).userType(), receivedTypeId);
-- 
cgit v1.2.3