Port from container::count() and length() to size() - V5

This is a the same semantic patch (qt-port-to-std-compatible-api V5
with config Scope: 'Container') as in dev. I've re-ran it in 6.4 to
avoid cherry-pick conflicts.

Change-Id: I9621dee5ed328b47e78919a34c307105e4311903
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>

20 files changed, 105 insertions, 105 deletions

diff --git a/src/remoteobjects/qremoteobjectabstractitemmodeltypes_p.h b/src/remoteobjects/qremoteobjectabstractitemmodeltypes_p.h
index 06f4491..922ab31 100644
--- a/src/remoteobjects/qremoteobjectabstractitemmodeltypes_p.h
+++ b/src/remoteobjects/qremoteobjectabstractitemmodeltypes_p.h
@@ -186,7 +186,7 @@ inline QModelIndex toQModelIndex(const IndexList &list, const QAbstractItemModel
     if (ok)
         *ok = true;
     QModelIndex result;
-    for (int i = 0; i < list.count(); ++i) {
+    for (int i = 0; i < list.size(); ++i) {
         const ModelIndex &index = list[i];
         if (ensureItem)
             const_cast<QAbstractItemModel *>(model)->setData(result, index.row, Qt::UserRole - 1);
diff --git a/src/remoteobjects/qremoteobjectcontainers.cpp b/src/remoteobjects/qremoteobjectcontainers.cpp
index c1d2519..9e4cc40 100644
--- a/src/remoteobjects/qremoteobjectcontainers.cpp
+++ b/src/remoteobjects/qremoteobjectcontainers.cpp
@@ -32,7 +32,7 @@ QDataStream &operator<<(QDataStream &ds, const QtROSequentialContainer &p)
 {
     ds << p.m_valueTypeName;
     auto pos = ds.device()->pos();
-    quint32 count = p.count();
+    quint32 count = p.size();
     ds << count;
     for (quint32 i = 0; i < count; i++) {
         if (!p.m_valueType.save(ds, p.at(i).data())) {
@@ -105,7 +105,7 @@ QDataStream &operator<<(QDataStream &ds, const QtROAssociativeContainer &p)
     ds << p.m_keyTypeName;
     ds << p.m_valueTypeName;
     auto pos = ds.device()->pos();
-    quint32 count = p.count();
+    quint32 count = p.size();
     ds << count;
     QAssociativeIterable map(&p);
     QAssociativeIterable::const_iterator iter = map.begin();
diff --git a/src/remoteobjects/qremoteobjectnode.cpp b/src/remoteobjects/qremoteobjectnode.cpp
index 609d015..2eae0bd 100644
--- a/src/remoteobjects/qremoteobjectnode.cpp
+++ b/src/remoteobjects/qremoteobjectnode.cpp
@@ -869,7 +869,7 @@ static int registerGadgets(QtROIoDeviceBase *connection, Gadgets &gadgets, QByte
         dynamicProperty.setReadable(true);
     }
     QList<TypeInfo *> enumsToBeAssignedMetaObject;
-    enumsToBeAssignedMetaObject.reserve(gadget.enums.length());
+    enumsToBeAssignedMetaObject.reserve(gadget.enums.size());
     for (const auto &enumData: gadget.enums) {
         auto enumBuilder = gadgetBuilder.addEnumerator(enumData.name);
         enumBuilder.setIsFlag(enumData.isFlag);
diff --git a/src/remoteobjects/qremoteobjectreplica.cpp b/src/remoteobjects/qremoteobjectreplica.cpp
index 9e8d97f..c5d8748 100644
--- a/src/remoteobjects/qremoteobjectreplica.cpp
+++ b/src/remoteobjects/qremoteobjectreplica.cpp
@@ -455,7 +455,7 @@ const QVariant QConnectedReplicaImplementation::getProperty(int i) const
 void QConnectedReplicaImplementation::setProperties(QVariantList &&properties)
 {
     Q_ASSERT(m_propertyStorage.isEmpty());
-    m_propertyStorage.reserve(properties.length());
+    m_propertyStorage.reserve(properties.size());
     m_propertyStorage = std::move(properties);
 }
 
@@ -566,7 +566,7 @@ void QConnectedReplicaImplementation::configurePrivate(QRemoteObjectReplica *rep
         // we are initializing an nth replica of the same type
         if (!firstReplicaInstance) {
             const int offset = m_propertyOffset;
-            const int nParam = int(m_propertyStorage.count());
+            const int nParam = int(m_propertyStorage.size());
             void *args[] = {nullptr, nullptr};
             for (int i = 0; i < nParam; ++i) {
                 const int notifyIndex = m_metaObject->property(i+offset).notifySignalIndex();
@@ -911,7 +911,7 @@ const QVariant QStubReplicaImplementation::getProperty(int i) const
 void QStubReplicaImplementation::setProperties(QVariantList &&properties)
 {
     Q_ASSERT(m_propertyStorage.isEmpty());
-    m_propertyStorage.reserve(properties.length());
+    m_propertyStorage.reserve(properties.size());
     m_propertyStorage = std::move(properties);
 }
 
diff --git a/src/remoteobjects/qremoteobjectsource.cpp b/src/remoteobjects/qremoteobjectsource.cpp
index 848c89e..db2e132 100644
--- a/src/remoteobjects/qremoteobjectsource.cpp
+++ b/src/remoteobjects/qremoteobjectsource.cpp
@@ -170,7 +170,7 @@ QRemoteObjectSourceBase::QRemoteObjectSourceBase(QObject *obj, Private *d, const
 
     setConnections();
 
-    const auto nChildren = api->m_models.count() + api->m_subclasses.count();
+    const auto nChildren = api->m_models.size() + api->m_subclasses.size();
     if (nChildren > 0) {
         QList<int> roles;
         const int numProperties = api->propertyCount();
@@ -315,7 +315,7 @@ void QRemoteObjectSourceBase::resetObject(QObject *newObject)
     if (newObject)
         setConnections();
 
-    const auto nChildren = m_api->m_models.count() + m_api->m_subclasses.count();
+    const auto nChildren = m_api->m_models.size() + m_api->m_subclasses.size();
     if (nChildren == 0)
         return;
 
@@ -466,7 +466,7 @@ void QRemoteObjectSourceBase::handleMetaCall(int index, QMetaObject::Call call,
         propertyIndex = internalIndex;
     }
 
-    qCDebug(QT_REMOTEOBJECT) << "# Listeners" << d->m_listeners.length();
+    qCDebug(QT_REMOTEOBJECT) << "# Listeners" << d->m_listeners.size();
     qCDebug(QT_REMOTEOBJECT) << "Invoke args:" << m_object
                              << (call == 0 ? QLatin1String("InvokeMetaMethod") : QStringLiteral("Non-invoked call: %d").arg(call))
                              << m_api->signalSignature(index) << *marshalArgs(index, a);
@@ -499,7 +499,7 @@ int QRemoteObjectRootSource::removeListener(QtROIoDeviceBase *io, bool shouldSen
         d->codec->serializeRemoveObjectPacket(m_api->name());
         d->codec->send(io);
     }
-    return int(d->m_listeners.length());
+    return int(d->m_listeners.size());
 }
 
 int QRemoteObjectSourceBase::qt_metacall(QMetaObject::Call call, int methodId, void **a)
diff --git a/src/repparser/qregexparser.h b/src/repparser/qregexparser.h
index d647d85..65316c6 100644
--- a/src/repparser/qregexparser.h
+++ b/src/repparser/qregexparser.h
@@ -186,7 +186,7 @@ QRegexParser<_Parser, _Table>::QRegexParser(int maxMatchLen) : d(new Data()), m_
         QRegularExpressionMatch match = re.match(text, 0, QRegularExpression::NormalMatch, QRegularExpression::DontCheckSubjectStringMatchOption);
         if (match.hasMatch()) {
             const QString token = match.captured(1);
-            const bool multiline = match.captured(2).length() > 0;
+            const bool multiline = match.captured(2).size() > 0;
             const QString pattern = match.captured(3);
             m_tokenNames.append(token);
             int index = i;
diff --git a/tests/auto/integration/tst_integration.cpp b/tests/auto/integration/tst_integration.cpp
index 62dfaf6..d815e1a 100644
--- a/tests/auto/integration/tst_integration.cpp
+++ b/tests/auto/integration/tst_integration.cpp
@@ -328,7 +328,7 @@ private slots:
             QSignalSpy spy(tc_rep.data(), &TestClassReplica::classEnumChanged);
             QVERIFY(spy.isValid());
             tc_rep->pushClassEnum(TestClassReplica::Two);
-            QVERIFY(spy.count() || spy.wait());
+            QVERIFY(spy.size() || spy.wait());
 
             QCOMPARE(qint32(tc.classEnum()), qint32(tc_rep->classEnum()));
         }
@@ -456,7 +456,7 @@ private slots:
         QSignalSpy spy(engine_r.data(), &QRemoteObjectReplica::stateChanged);
         host->disableRemoting(&e);
         spy.wait();
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
 
         instances = client->instances<EngineReplica>();
         QCOMPARE(instances, QStringList({"Engine2"}));
@@ -509,8 +509,8 @@ private slots:
         QSignalSpy clientSpy(client->registry(), &QRemoteObjectRegistry::remoteObjectAdded);
 
         host->enableRemoting(&e1, engine1);
-        QTRY_COMPARE(hostSpy.count(), 1);
-        QTRY_COMPARE(clientSpy.count(), 1);
+        QTRY_COMPARE(hostSpy.size(), 1);
+        QTRY_COMPARE(clientSpy.size(), 1);
         QCOMPARE(hostObserver.value(), host->registry()->sourceLocations());
         QCOMPARE(clientObserver.value(), client->registry()->sourceLocations());
         QCOMPARE(hostObserver.value(), clientObserver.value());
@@ -520,8 +520,8 @@ private slots:
 
         expectedSourceLocations[engine2] = { QStringLiteral("Engine"), hostUrl };
         host->enableRemoting(&e2, engine2);
-        QTRY_COMPARE(hostSpy.count(), 2);
-        QTRY_COMPARE(clientSpy.count(), 2);
+        QTRY_COMPARE(hostSpy.size(), 2);
+        QTRY_COMPARE(clientSpy.size(), 2);
         QCOMPARE(hostObserver.value(), host->registry()->sourceLocations());
         QCOMPARE(clientObserver.value(), client->registry()->sourceLocations());
         QCOMPARE(hostObserver.value(), clientObserver.value());
@@ -536,8 +536,8 @@ private slots:
         QSignalSpy srcRemovedClientSpy(client->registry(),
                                        &QRemoteObjectRegistry::remoteObjectRemoved);
 
-        QTRY_COMPARE(srcRemovedHostSpy.count(), 1);
-        QTRY_COMPARE(srcRemovedClientSpy.count(), 1);
+        QTRY_COMPARE(srcRemovedHostSpy.size(), 1);
+        QTRY_COMPARE(srcRemovedClientSpy.size(), 1);
         QCOMPARE(hostObserver.value(), host->registry()->sourceLocations());
         QCOMPARE(clientObserver.value(), client->registry()->sourceLocations());
         QCOMPARE(hostObserver.value(), clientObserver.value());
@@ -728,7 +728,7 @@ private slots:
         QSignalSpy addedSpy(host->registry(), &QRemoteObjectRegistry::remoteObjectAdded);
         setupRegistry();
         bool added = addedSpy.wait();
-        QVERIFY(spy.count() > 0);
+        QVERIFY(spy.size() > 0);
         QCOMPARE(added, true);
         QCOMPARE(host->registry()->sourceLocations().keys().isEmpty(), false);
         QCOMPARE(host->registry()->sourceLocations().keys().at(0), QStringLiteral("Engine"));
@@ -769,7 +769,7 @@ private slots:
         e.setRpm(2345);
 
         spy.wait();
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
         const QVariantList &arguments = spy.first();
         bool ok;
         int res = arguments.at(0).toInt(&ok);
@@ -798,7 +798,7 @@ private slots:
              });
         e.setRpm(3456);
         spy.wait();
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
         const QVariantList &arguments = spy.first();
         bool ok;
         int res = arguments.at(0).toInt(&ok);
@@ -856,7 +856,7 @@ private slots:
         QRemoteObjectPendingCallWatcher watcher(reply);
         QSignalSpy spy(&watcher, &QRemoteObjectPendingCallWatcher::finished);
         spy.wait();
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
 
         QVERIFY(reply.isFinished());
         QCOMPARE(reply.returnValue(), true);
@@ -1011,7 +1011,7 @@ private slots:
         QSignalSpy spy(engine_r.data(), &EngineReplica::rpmChanged);
         engine_r->setRpm(42);
         spy.wait();
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
         QCOMPARE(engine_r->rpm(), 42);
     }
 
@@ -1029,7 +1029,7 @@ private slots:
         QSignalSpy spy(engine_r.data(), &EngineReplica::startedChanged);
         engine_r->pushStarted(true);
         spy.wait();
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
         QCOMPARE(engine_r->started(), true);
     }
 
@@ -1052,7 +1052,7 @@ private slots:
         QSignalSpy spy(engine_dr.data(), QByteArray(QByteArrayLiteral("2")+mp.notifySignal().methodSignature().constData()));
         mp.write(engine_dr.data(), 44);
         spy.wait();
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
         QCOMPARE(mp.read(engine_dr.data()).toInt(), 44);
     }
 
@@ -1072,7 +1072,7 @@ private slots:
         QSignalSpy spy(engine_r.data(), &EngineReplica::rpmChanged);
         engine_r->increaseRpm(1000);
         spy.wait();
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
         QCOMPARE(engine_r->rpm(), 1000);
     }
 
@@ -1145,7 +1145,7 @@ private slots:
         QSignalSpy spy_r1(engine_r1.data(), &EngineReplica::rpmChanged);
         engine_r1->waitForSource();
         QCOMPARE(engine_r1->rpm(), e.rpm());
-        QCOMPARE(spy_r1.count(), 1);
+        QCOMPARE(spy_r1.size(), 1);
 
         // NOTE: A second replica will have initialized and notify signals emitted as part of acquire,
         // which leads to different semantics for first and second replicas. Specifically, there is no
@@ -1200,7 +1200,7 @@ private slots:
 
         // replica gets source change
         source.setValue(1);
-        QTRY_COMPARE(spy.count(), 1);
+        QTRY_COMPARE(spy.size(), 1);
         QCOMPARE(replica->property("value"), QVariant(1));
 
         // source gets replica change
@@ -1216,7 +1216,7 @@ private slots:
 
         // replica gets source change
         source.setOtherValue(1);
-        QTRY_COMPARE(otherSpy.count(), 1);
+        QTRY_COMPARE(otherSpy.size(), 1);
         QCOMPARE(replica->property("otherValue"), QVariant(1));
 
         // source gets replica change
@@ -1314,7 +1314,7 @@ private slots:
         Q_SET_OBJECT_NAME(_client);
         QSignalSpy errorSpy(&_client, &QRemoteObjectNode::error);
         QVERIFY(!_client.connectToNode(QUrl(QLatin1String("invalid:invalid"))));
-        QCOMPARE(errorSpy.count(), 1);
+        QCOMPARE(errorSpy.size(), 1);
         auto emittedErrorCode = errorSpy.first().at(0).value<QRemoteObjectNode::ErrorCode>();
         QCOMPARE(emittedErrorCode, QRemoteObjectNode::RegistryNotAcquired);
         QCOMPARE(_client.lastError(), QRemoteObjectNode::RegistryNotAcquired);
@@ -1331,7 +1331,7 @@ private slots:
         e.setRpm(50);
 
         spy.wait();
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
 
         QCOMPARE(engine_d->rpm(), e.rpm());
     }
@@ -1354,7 +1354,7 @@ private slots:
         const QByteArray data(16384,'y');
         emit t.send(data);
         spy.wait();
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
         const QVariantList &arguments = spy.first();
         QVERIFY(arguments.at(0).toByteArray() == data);
         QVERIFY(host->disableRemoting(&t));
diff --git a/tests/auto/integration_external/client/main.cpp b/tests/auto/integration_external/client/main.cpp
index e2d84b9..ff0b063 100644
--- a/tests/auto/integration_external/client/main.cpp
+++ b/tests/auto/integration_external/client/main.cpp
@@ -49,7 +49,7 @@ private Q_SLOTS:
         QSignalSpy spy(m_rep.data(), &MyInterfaceReplica::enum1Changed);
         QVERIFY(advanceSpy.wait());
 
-        QCOMPARE(spy.count(), 2);
+        QCOMPARE(spy.size(), 2);
         // END: Testing
 
         reply = m_rep->stop();
@@ -152,10 +152,10 @@ private Q_SLOTS:
         QSignalSpy stateSpy(m_rep.data(), &MyInterfaceReplica::stateChanged);
         QVERIFY(reply.waitForFinished());
 
-        QTRY_COMPARE(stateSpy.count(), 1);
+        QTRY_COMPARE(stateSpy.size(), 1);
         QCOMPARE(m_rep->state(), QRemoteObjectReplica::Suspect);
 
-        QTRY_COMPARE(stateSpy.count(), 2);
+        QTRY_COMPARE(stateSpy.size(), 2);
         QCOMPARE(m_rep->state(), QRemoteObjectReplica::Valid);
         // Make sure we updated to the correct enum1 value
         QCOMPARE(m_rep->enum1(), MyInterfaceReplica::First);
diff --git a/tests/auto/integration_multiprocess/client/main.cpp b/tests/auto/integration_multiprocess/client/main.cpp
index 40ab71b..0df0afb 100644
--- a/tests/auto/integration_multiprocess/client/main.cpp
+++ b/tests/auto/integration_multiprocess/client/main.cpp
@@ -38,7 +38,7 @@ private Q_SLOTS:
         QSignalSpy spy(m_rep.data(), &MyInterfaceReplica::enum1Changed);
         QVERIFY(advanceSpy.wait());
 
-        QCOMPARE(spy.count(), 2);
+        QCOMPARE(spy.size(), 2);
         // END: Testing
 
         reply = m_rep->stop();
@@ -147,7 +147,7 @@ private Q_SLOTS:
         QSignalSpy spy(rep.data(), &MyInterfaceReplica::testExtPODListSignal);
         connect(rep.data(), &MyInterfaceReplica::testExtPODListSignal,
                 [list](const QList<ExtPOD> &l) { QCOMPARE(l, list); });
-        QTRY_COMPARE(spy.count(), 1);
+        QTRY_COMPARE(spy.size(), 1);
     }
 
     void testPod()
diff --git a/tests/auto/modelreplica/tst_modelreplicatest.cpp b/tests/auto/modelreplica/tst_modelreplicatest.cpp
index 33e4bd5..60b3771 100644
--- a/tests/auto/modelreplica/tst_modelreplicatest.cpp
+++ b/tests/auto/modelreplica/tst_modelreplicatest.cpp
@@ -77,7 +77,7 @@ void ModelreplicaTest::basicFunctions()
     QSignalSpy otherTracksSpy(otherReplica->tracks(), &QAbstractItemModelReplica::initialized);
     QVERIFY(otherReplica->waitForSource(300));
     QVERIFY(otherTracksSpy.wait());
-    QCOMPARE(otherReplica->tracks()->availableRoles().count(), 2);
+    QCOMPARE(otherReplica->tracks()->availableRoles().size(), 2);
 
 }
 
diff --git a/tests/auto/modelview/tst_modelview.cpp b/tests/auto/modelview/tst_modelview.cpp
index be0b976..44d2c35 100644
--- a/tests/auto/modelview/tst_modelview.cpp
+++ b/tests/auto/modelview/tst_modelview.cpp
@@ -231,7 +231,7 @@ class RolenamesListModel : public QAbstractListModel
 {
 public:
     explicit RolenamesListModel(QObject *parent = nullptr) : QAbstractListModel(parent) { }
-    int rowCount(const QModelIndex &) const override { return int(m_list.length()); }
+    int rowCount(const QModelIndex &) const override { return int(m_list.size()); }
     QVariant data(const QModelIndex &index, int role) const override
     {
        if (role == Qt::UserRole)
diff --git a/tests/auto/proxy/tst_proxy.cpp b/tests/auto/proxy/tst_proxy.cpp
index 072ccbd..67b5b93 100644
--- a/tests/auto/proxy/tst_proxy.cpp
+++ b/tests/auto/proxy/tst_proxy.cpp
@@ -123,12 +123,12 @@ void ProxyTest::testProxy()
         QSignalSpy replicaSpy(rep, &EngineReplica::rpmChanged);
         rep->pushRpm(42);
         sourceSpy.wait();
-        QCOMPARE(sourceSpy.count(), 1);
+        QCOMPARE(sourceSpy.size(), 1);
         QCOMPARE(engine.rpm(), 42);
 
         // ... and the change makes it back to the replica
         replicaSpy.wait();
-        QCOMPARE(replicaSpy.count(), 1);
+        QCOMPARE(replicaSpy.size(), 1);
         QCOMPARE(rep->rpm(), 42);
     } else {
         replica.reset(client.acquireDynamic(QStringLiteral("Engine")));
@@ -156,12 +156,12 @@ void ProxyTest::testProxy()
         QVERIFY(pushMethod.invoke(replica.data(), Q_ARG(int, 42)));
 
         sourceSpy.wait();
-        QCOMPARE(sourceSpy.count(), 1);
+        QCOMPARE(sourceSpy.size(), 1);
         QCOMPARE(engine.rpm(), 42);
 
         // ... and the change makes it back to the replica
         replicaSpy.wait();
-        QCOMPARE(replicaSpy.count(), 1);
+        QCOMPARE(replicaSpy.size(), 1);
         QCOMPARE(rpmMeta.read(replica.data()).value<int>(), engine.rpm());
     }
 
@@ -170,7 +170,7 @@ void ProxyTest::testProxy()
     Q_ASSERT(res);
     QSignalSpy stateSpy(replica.data(), &QRemoteObjectReplica::stateChanged);
     stateSpy.wait();
-    QCOMPARE(stateSpy.count(), 1);
+    QCOMPARE(stateSpy.size(), 1);
     QCOMPARE(replica->state(), QRemoteObjectReplica::Suspect);
 
     // Now test subclass Source
@@ -198,7 +198,7 @@ void ProxyTest::testProxy()
         QVERIFY(rep->subClass() != nullptr);
         QCOMPARE(rep->subClass()->myPOD(), parent.subClass()->myPOD());
         QVERIFY(rep->tracks() != nullptr);
-        QVERIFY(tracksSpy.count() || tracksSpy.wait());
+        QVERIFY(tracksSpy.size() || tracksSpy.wait());
         // Rep file only uses display role, but proxy doesn't forward that yet
         if (!useProxy)
             QCOMPARE(rep->tracks()->availableRoles(), QList<int> { Qt::DisplayRole });
@@ -240,7 +240,7 @@ void ProxyTest::testProxy()
         QSignalSpy replicaSpy(rep, &ParentClassReplica::subClassChanged);
         parent.setSubClass(&updatedSubclass);
         replicaSpy.wait();
-        QCOMPARE(replicaSpy.count(), 1);
+        QCOMPARE(replicaSpy.size(), 1);
         QCOMPARE(rep->subClass()->myPOD(), parent.subClass()->myPOD());
         QCOMPARE(rep->subClass()->myPOD(), updatedValue);
     } else {
@@ -316,7 +316,7 @@ void ProxyTest::testProxy()
         QSignalSpy replicaSpy(replica.data(), QByteArray(QByteArrayLiteral("2")+subclassMeta.notifySignal().methodSignature().constData()));
         parent.setSubClass(&updatedSubclass);
         replicaSpy.wait();
-        QCOMPARE(replicaSpy.count(), 1);
+        QCOMPARE(replicaSpy.size(), 1);
         subclassQObjectPtr = subclassMeta.read(replica.data()).value<QObject *>();
         QVERIFY(subclassQObjectPtr != nullptr);
         subclassReplica = qobject_cast<QRemoteObjectDynamicReplica *>(subclassQObjectPtr);
diff --git a/tests/auto/proxy_multiprocess/client/main.cpp b/tests/auto/proxy_multiprocess/client/main.cpp
index 0888c22..0c7832e 100644
--- a/tests/auto/proxy_multiprocess/client/main.cpp
+++ b/tests/auto/proxy_multiprocess/client/main.cpp
@@ -44,7 +44,7 @@ private Q_SLOTS:
             QCOMPARE(m_rep->subClass()->myPOD(), initialValue);
             QCOMPARE(m_rep->subClass()->i(), initialI);
             QVERIFY(m_rep->tracks() != nullptr);
-            QVERIFY(tracksSpy.count() || tracksSpy.wait());
+            QVERIFY(tracksSpy.size() || tracksSpy.wait());
             QCOMPARE(m_rep->myEnum(), ParentClassReplica::bar);
             QCOMPARE(m_rep->date(), Qt::RFC2822Date);
             QCOMPARE(m_rep->nsEnum(), NS::Bravo);
@@ -79,12 +79,12 @@ private Q_SLOTS:
         QVERIFY(reply.error() == QRemoteObjectPendingCall::NoError);
         QCOMPARE(reply.returnValue(), QVariant::fromValue(true));
         QVERIFY(enumSpy.wait());
-        QCOMPARE(enumSpy.count(), 1);
+        QCOMPARE(enumSpy.size(), 1);
         const auto arguments = enumSpy.takeFirst();
         QCOMPARE(arguments.at(0), QVariant::fromValue(ParentClassReplica::foo));
         QCOMPARE(arguments.at(1), QVariant::fromValue(ParentClassReplica::bar));
 
-        QVERIFY(advanceSpy.count() || advanceSpy.wait());
+        QVERIFY(advanceSpy.size() || advanceSpy.wait());
         QVERIFY(m_rep->subClass() != nullptr);
         QCOMPARE(m_rep->subClass()->myPOD(), updatedValue);
         QCOMPARE(m_rep->subClass()->i(), updatedI);
diff --git a/tests/auto/qml/usertypes/tst_usertypes.cpp b/tests/auto/qml/usertypes/tst_usertypes.cpp
index 9a7681c..648fc07 100644
--- a/tests/auto/qml/usertypes/tst_usertypes.cpp
+++ b/tests/auto/qml/usertypes/tst_usertypes.cpp
@@ -252,7 +252,7 @@ void tst_usertypes::hostInQml()
 
     QSignalSpy spy(replica, &SimpleClockReplica::timeUpdated);
     spy.wait();
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 }
 
 void tst_usertypes::twoReplicas()
diff --git a/tests/auto/repc/signature/matchAndQuit/main.cpp b/tests/auto/repc/signature/matchAndQuit/main.cpp
index c3ff8a4..3cc9203 100644
--- a/tests/auto/repc/signature/matchAndQuit/main.cpp
+++ b/tests/auto/repc/signature/matchAndQuit/main.cpp
@@ -24,17 +24,17 @@ private Q_SLOTS:
         QVERIFY(rep->quit().waitForFinished());
         QTRY_COMPARE(rep->state(), QRemoteObjectReplica::Suspect);
 
-        QCOMPARE(stateChangedSpy.count(), 2);
+        QCOMPARE(stateChangedSpy.size(), 2);
 
         // Test Default to Valid transition
         auto args = stateChangedSpy.takeFirst();
-        QCOMPARE(args.count(), 2);
+        QCOMPARE(args.size(), 2);
         QCOMPARE(args.at(0).toInt(), int(QRemoteObjectReplica::Valid));
         QCOMPARE(args.at(1).toInt(), int(QRemoteObjectReplica::Default));
 
         // Test Valid to Suspect transition
         args = stateChangedSpy.takeFirst();
-        QCOMPARE(args.count(), 2);
+        QCOMPARE(args.size(), 2);
         QCOMPARE(args.at(0).toInt(), int(QRemoteObjectReplica::Suspect));
         QCOMPARE(args.at(1).toInt(), int(QRemoteObjectReplica::Valid));
     }
diff --git a/tests/auto/repc/signature/state/main.cpp b/tests/auto/repc/signature/state/main.cpp
index 573bc2f..273db10 100644
--- a/tests/auto/repc/signature/state/main.cpp
+++ b/tests/auto/repc/signature/state/main.cpp
@@ -19,9 +19,9 @@ private Q_SLOTS:
         QSharedPointer<TestClassReplica> rep{repNode.acquire<TestClassReplica>()};
         QSignalSpy stateChangedSpy(rep.data(), &QRemoteObjectReplica::stateChanged);
         QTRY_COMPARE(rep->state(), QRemoteObjectReplica::SignatureMismatch);
-        QCOMPARE(stateChangedSpy.count(), 1);
+        QCOMPARE(stateChangedSpy.size(), 1);
         auto args = stateChangedSpy.takeFirst();
-        QCOMPARE(args.count(), 2);
+        QCOMPARE(args.size(), 2);
         QCOMPARE(args.at(0).toInt(), int(QRemoteObjectReplica::SignatureMismatch));
         QCOMPARE(args.at(1).toInt(), int(QRemoteObjectReplica::Default));
     }
@@ -33,9 +33,9 @@ private Q_SLOTS:
         QSharedPointer<QRemoteObjectDynamicReplica> rep{repNode.acquireDynamic("TestClass")};
         QSignalSpy stateChangedSpy(rep.data(), &QRemoteObjectReplica::stateChanged);
         QTRY_COMPARE(rep->state(), QRemoteObjectReplica::Valid);
-        QCOMPARE(stateChangedSpy.count(), 1);
+        QCOMPARE(stateChangedSpy.size(), 1);
         auto args = stateChangedSpy.takeFirst();
-        QCOMPARE(args.count(), 2);
+        QCOMPARE(args.size(), 2);
         QCOMPARE(args.at(0).toInt(), int(QRemoteObjectReplica::Valid));
         QCOMPARE(args.at(1).toInt(), int(QRemoteObjectReplica::Uninitialized));
     }
diff --git a/tests/auto/repparser/tst_parser.cpp b/tests/auto/repparser/tst_parser.cpp
index f7da709..1bac08e 100644
--- a/tests/auto/repparser/tst_parser.cpp
+++ b/tests/auto/repparser/tst_parser.cpp
@@ -142,11 +142,11 @@ void tst_Parser::testProperties()
     QVERIFY(parser.parse());
 
     const AST ast = parser.ast();
-    QCOMPARE(ast.classes.count(), 1);
+    QCOMPARE(ast.classes.size(), 1);
 
     const ASTClass astClass = ast.classes.first();
     const QList<ASTProperty> properties = astClass.properties;
-    QCOMPARE(properties.count(), 1);
+    QCOMPARE(properties.size(), 1);
 
     const ASTProperty property = properties.first();
     QCOMPARE(property.type, expectedType);
@@ -197,11 +197,11 @@ void tst_Parser::testSlots()
     QVERIFY(parser.parse());
 
     const AST ast = parser.ast();
-    QCOMPARE(ast.classes.count(), 1);
+    QCOMPARE(ast.classes.size(), 1);
 
     const ASTClass astClass = ast.classes.first();
     const QList<ASTFunction> slotsList = astClass.slotsList;
-    QCOMPARE(slotsList.count(), 1);
+    QCOMPARE(slotsList.size(), 1);
     ASTFunction slot = slotsList.first();
     QCOMPARE(QString("%1 %2(%3)").arg(slot.returnType).arg(slot.name).arg(slot.paramsAsString()), expectedSlot);
 }
@@ -237,7 +237,7 @@ void tst_Parser::testSignals()
     QVERIFY(parser.parse());
 
     const AST ast = parser.ast();
-    QCOMPARE(ast.classes.count(), 1);
+    QCOMPARE(ast.classes.size(), 1);
 
     const ASTClass astClass = ast.classes.first();
     const QList<ASTFunction> signalsList = astClass.signalsList;
@@ -283,16 +283,16 @@ void tst_Parser::testPods()
     QVERIFY(parser.parse());
 
     const AST ast = parser.ast();
-    QCOMPARE(ast.classes.count(), 1);
+    QCOMPARE(ast.classes.size(), 1);
 
-    QCOMPARE(ast.pods.count(), 1);
+    QCOMPARE(ast.pods.size(), 1);
     const POD pods = ast.pods.first();
     const QList<PODAttribute> podsList = pods.attributes;
     const QStringList typeList = expectedtypes.split(QLatin1Char(';'));
     const QStringList variableList = expectedvariables.split(QLatin1Char(';'));
-    QVERIFY(typeList.count() == variableList.count());
-    QVERIFY(podsList.count() == variableList.count());
-    for (int i=0; i < podsList.count(); ++i) {
+    QVERIFY(typeList.size() == variableList.size());
+    QVERIFY(podsList.size() == variableList.size());
+    for (int i=0; i < podsList.size(); ++i) {
         QCOMPARE(podsList.at(i).name, variableList.at(i));
         QCOMPARE(podsList.at(i).type, typeList.at(i));
     }
@@ -338,16 +338,16 @@ void tst_Parser::testPods2()
     QVERIFY(parser.parse());
 
     const AST ast = parser.ast();
-    QCOMPARE(ast.classes.count(), 1);
+    QCOMPARE(ast.classes.size(), 1);
 
-    QCOMPARE(ast.pods.count(), 1);
+    QCOMPARE(ast.pods.size(), 1);
     const POD pods = ast.pods.first();
     const QVector<PODAttribute> podsList = pods.attributes;
     const QStringList typeList = expectedtypes.split(QLatin1Char(';'));
     const QStringList variableList = expectedvariables.split(QLatin1Char(';'));
-    QVERIFY(typeList.count() == variableList.count());
-    QVERIFY(podsList.count() == variableList.count());
-    for (int i=0; i < podsList.count(); ++i) {
+    QVERIFY(typeList.size() == variableList.size());
+    QVERIFY(podsList.size() == variableList.size());
+    for (int i=0; i < podsList.size(); ++i) {
         QCOMPARE(podsList.at(i).name, variableList.at(i));
         QCOMPARE(podsList.at(i).type, typeList.at(i));
     }
@@ -404,23 +404,23 @@ void tst_Parser::testEnums()
     QVERIFY(parser.parse());
 
     const AST ast = parser.ast();
-    QCOMPARE(ast.classes.count(), 1);
+    QCOMPARE(ast.classes.size(), 1);
     ASTEnum enums;
     if (inclass) {
         const ASTClass astClass = ast.classes.first();
-        QCOMPARE(astClass.enums.count(), 1);
+        QCOMPARE(astClass.enums.size(), 1);
         enums = astClass.enums.first();
     } else {
-        QCOMPARE(ast.enums.count(), 1);
+        QCOMPARE(ast.enums.size(), 1);
         enums = ast.enums.first();
     }
     QVERIFY(enums.isScoped == false);
     QVERIFY(enums.type.isEmpty());
     const QList<ASTEnumParam> paramList = enums.params;
     const QStringList nameList = expectednames.split(QLatin1Char(';'));
-    QVERIFY(nameList.count() == expectedvalues.count());
-    QVERIFY(paramList.count() == expectedvalues.count());
-    for (int i=0; i < paramList.count(); ++i) {
+    QVERIFY(nameList.size() == expectedvalues.size());
+    QVERIFY(paramList.size() == expectedvalues.size());
+    for (int i=0; i < paramList.size(); ++i) {
         QCOMPARE(paramList.at(i).name, nameList.at(i));
         QCOMPARE(paramList.at(i).value, expectedvalues.at(i));
     }
@@ -480,17 +480,17 @@ void tst_Parser::testTypedEnums()
     QVERIFY(parser.parse());
 
     const AST ast = parser.ast();
-    QCOMPARE(ast.classes.count(), 1);
+    QCOMPARE(ast.classes.size(), 1);
     ASTEnum enums;
     ASTFlag flags;
     if (inclass) {
         const ASTClass astClass = ast.classes.first();
-        QCOMPARE(astClass.enums.count(), 1);
+        QCOMPARE(astClass.enums.size(), 1);
         enums = astClass.enums.first();
         if (isflag)
             flags = astClass.flags.first();
     } else {
-        QCOMPARE(ast.enums.count(), 1);
+        QCOMPARE(ast.enums.size(), 1);
         enums = ast.enums.first();
         if (isflag)
             flags = ast.flags.first();
@@ -501,8 +501,8 @@ void tst_Parser::testTypedEnums()
     QVERIFY(flags._enum == (isflag ? "preset" : QString{}));
     QCOMPARE(enums.type, expectedtype);
     const QList<ASTEnumParam> paramList = enums.params;
-    QVERIFY(paramList.count() == 1);
-    for (int i=0; i < paramList.count(); ++i) {
+    QVERIFY(paramList.size() == 1);
+    for (int i=0; i < paramList.size(); ++i) {
         QCOMPARE(paramList.at(i).name, "presetNumber");
         QCOMPARE(paramList.at(i).value, 0);
     }
@@ -538,7 +538,7 @@ void tst_Parser::testModels()
     QVERIFY(parser.parse());
 
     const AST ast = parser.ast();
-    QCOMPARE(ast.classes.count(), 1);
+    QCOMPARE(ast.classes.size(), 1);
 
     const ASTClass astClass = ast.classes.first();
     ASTModel model = astClass.modelMetadata.first();
@@ -582,7 +582,7 @@ void tst_Parser::testClasses()
     QVERIFY(parser.parse());
 
     const AST ast = parser.ast();
-    QCOMPARE(ast.classes.count(), 2);
+    QCOMPARE(ast.classes.size(), 2);
 
     const ASTClass astSub = ast.classes.value(0);
     const ASTClass astObj = ast.classes.value(1);
diff --git a/tests/auto/restart/client/main.cpp b/tests/auto/restart/client/main.cpp
index 0443554..5722a6f 100644
--- a/tests/auto/restart/client/main.cpp
+++ b/tests/auto/restart/client/main.cpp
@@ -44,7 +44,7 @@ private Q_SLOTS:
             QVERIFY(m_rep->subClass() != nullptr);
             QCOMPARE(m_rep->subClass()->myPOD(), initialValue);
             QVERIFY(m_rep->tracks() != nullptr);
-            QVERIFY(tracksSpy.count() || tracksSpy.wait());
+            QVERIFY(tracksSpy.size() || tracksSpy.wait());
         } else {
             QVERIFY(m_rep->subClass() == nullptr);
             QVERIFY(m_rep->tracks() == nullptr);
diff --git a/tools/repc/main.cpp b/tools/repc/main.cpp
index 208bfdc..37b318c 100644
--- a/tools/repc/main.cpp
+++ b/tools/repc/main.cpp
@@ -88,7 +88,7 @@ int main(int argc, char **argv)
 
     const QStringList files = parser.positionalArguments();
 
-    if (files.count() > 2) {
+    if (files.size() > 2) {
         fprintf(stderr, "%s", qPrintable(QLatin1String(PROGRAM_NAME ": Too many input, output files specified: '") + files.join(QStringLiteral("' '")) + QStringLiteral("\'.\n")));
         parser.showHelp(1);
     }
@@ -121,7 +121,7 @@ int main(int argc, char **argv)
         }
     }
 
-    switch (files.count()) {
+    switch (files.size()) {
     case 2:
         outputFile = files.last();
         if (!(mode & (OutRep | OutSource | OutReplica))) {
diff --git a/tools/repc/repcodegenerator.cpp b/tools/repc/repcodegenerator.cpp
index deeeb7b..ed61d67 100644
--- a/tools/repc/repcodegenerator.cpp
+++ b/tools/repc/repcodegenerator.cpp
@@ -79,7 +79,7 @@ static QString fullyQualifiedName(const ASTClass& classContext, const QString &c
     for (const QRegularExpressionMatch &match : re.globalMatch(typeName)) {
         if (isClassEnum(classContext, match.captured(1))) {
             copy.insert(match.capturedStart(1) + offset, className + QStringLiteral("::"));
-            offset += className.length() + 2;
+            offset += className.size() + 2;
         }
     }
     return copy;
@@ -241,7 +241,7 @@ void RepCodeGenerator::generateHeader(Mode mode)
     bool hasModel = false;
     for (auto c : m_ast.classes)
     {
-        if (c.modelMetadata.count() > 0)
+        if (c.modelMetadata.size() > 0)
         {
             hasModel = true;
             break;
@@ -583,7 +583,7 @@ void RepCodeGenerator::generateClass(Mode mode, const ASTClass &astClass,
                  << "\")" << Qt::endl;
         m_stream << "    Q_CLASSINFO(QCLASSINFO_REMOTEOBJECT_SIGNATURE, \""
                  << QLatin1String(classSignature(astClass)) << "\")" << Qt::endl;
-        for (int i = 0; i < astClass.modelMetadata.count(); i++) {
+        for (int i = 0; i < astClass.modelMetadata.size(); i++) {
             const auto model = astClass.modelMetadata.at(i);
             const auto modelName = astClass.properties.at(model.propertyIndex).name;
             if (!model.roles.isEmpty()) {
@@ -656,7 +656,7 @@ void RepCodeGenerator::generateClass(Mode mode, const ASTClass &astClass,
             m_stream << "    void setNode(QRemoteObjectNode *node) override" << Qt::endl;
             m_stream << "    {" << Qt::endl;
             m_stream << "        QRemoteObjectReplica::setNode(node);" << Qt::endl;
-            for (int index = 0; index < astClass.properties.count(); ++index) {
+            for (int index = 0; index < astClass.properties.size(); ++index) {
                 const ASTProperty &property = astClass.properties.at(index);
                 if (!property.isPointer)
                     continue;
@@ -685,7 +685,7 @@ void RepCodeGenerator::generateClass(Mode mode, const ASTClass &astClass,
         m_stream << "        : QRemoteObjectReplica(ConstructWithNode)" << Qt::endl;
         m_stream << "    {" << Qt::endl;
         m_stream << "        initializeNode(node, name);" << Qt::endl;
-        for (int index = 0; index < astClass.properties.count(); ++index) {
+        for (int index = 0; index < astClass.properties.size(); ++index) {
             const ASTProperty &property = astClass.properties.at(index);
             if (!property.isPointer)
                 continue;
@@ -747,7 +747,7 @@ void RepCodeGenerator::generateClass(Mode mode, const ASTClass &astClass,
         m_stream << "    }" << Qt::endl;
     } else {
         QList<int> constIndices;
-        for (int index = 0; index < astClass.properties.count(); ++index) {
+        for (int index = 0; index < astClass.properties.size(); ++index) {
             const ASTProperty &property = astClass.properties.at(index);
             if (property.modifier == ASTProperty::Constant)
                 constIndices.append(index);
@@ -1030,8 +1030,8 @@ void RepCodeGenerator::generateSourceAPI(const ASTClass &astClass)
     if (!astClass.hasPointerObjects())
         m_stream << QStringLiteral("        Q_UNUSED(object)") << Qt::endl;
 
-    const auto enumCount = astClass.enums.count();
-    const auto totalCount = enumCount + astClass.flags.count();
+    const auto enumCount = astClass.enums.size();
+    const auto totalCount = enumCount + astClass.flags.size();
     for (int i : astClass.subClassPropertyIndices) {
         const ASTProperty &child = astClass.properties.at(i);
         m_stream << QString::fromLatin1("        using %1_type_t = typename std::remove_pointer<"
@@ -1051,7 +1051,7 @@ void RepCodeGenerator::generateSourceAPI(const ASTClass &astClass)
                                         "indexOfEnumerator(\"%2\");")
                                         .arg(i+1).arg(flag.name) << Qt::endl;
     }
-    const auto propCount = astClass.properties.count();
+    const auto propCount = astClass.properties.size();
     m_stream << QString::fromLatin1("        m_properties[0] = %1;").arg(propCount) << Qt::endl;
     QList<ASTProperty> onChangeProperties;
     QList<qsizetype> propertyChangeIndex;
@@ -1080,7 +1080,7 @@ void RepCodeGenerator::generateSourceAPI(const ASTClass &astClass)
             propertyChangeIndex << i + 1; //m_properties[0] is the count, so index is one higher
         }
     }
-    const auto signalCount = astClass.signalsList.count();
+    const auto signalCount = astClass.signalsList.size();
     const auto changedCount = onChangeProperties.size();
     m_stream << QString::fromLatin1("        m_signals[0] = %1;")
                                     .arg(signalCount+onChangeProperties.size()) << Qt::endl;
@@ -1111,13 +1111,13 @@ void RepCodeGenerator::generateSourceAPI(const ASTClass &astClass)
                                              QString::number(changedCount+i))
                  << Qt::endl;
     }
-    const auto slotCount = astClass.slotsList.count();
+    const auto slotCount = astClass.slotsList.size();
     QList<ASTProperty> pushProps;
     for (const ASTProperty &property : astClass.properties) {
         if (property.modifier == ASTProperty::ReadPush)
             pushProps << property;
     }
-    const auto pushCount = pushProps.count();
+    const auto pushCount = pushProps.size();
     const auto methodCount = slotCount + pushCount;
     m_stream << QString::fromLatin1("        m_methods[0] = %1;").arg(methodCount) << Qt::endl;
     const QString objType = QStringLiteral("typename ObjectType::");
@@ -1337,7 +1337,7 @@ void RepCodeGenerator::generateSourceAPI(const ASTClass &astClass)
             const auto paramsAsList = paramsAsString.split(QLatin1String(","));
             int enumCount = 0;
             QString enumString;
-            for (int j = 0; j < paramsAsList.count(); j++) {
+            for (int j = 0; j < paramsAsList.size(); j++) {
                 auto const p = paramsAsList.at(j);
                 if (isClassEnum(astClass, p)) {
                     paramsAsString.replace(paramsAsString.indexOf(p), p.size(),
@@ -1402,7 +1402,7 @@ void RepCodeGenerator::generateSourceAPI(const ASTClass &astClass)
             const auto paramsAsList = paramsAsString.split(QLatin1String(","));
             int enumCount = 0;
             QString enumString;
-            for (int j = 0; j < paramsAsList.count(); j++) {
+            for (int j = 0; j < paramsAsList.size(); j++) {
                 auto const p = paramsAsList.at(j);
                 if (isClassEnum(astClass, p)) {
                     paramsAsString.replace(paramsAsString.indexOf(p), p.size(),