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>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

7 files changed, 27 insertions, 27 deletions

diff --git a/src/plugins/sensors/dummy/dummycommon.cpp b/src/plugins/sensors/dummy/dummycommon.cpp
index 772f033..f5b6314 100644
--- a/src/plugins/sensors/dummy/dummycommon.cpp
+++ b/src/plugins/sensors/dummy/dummycommon.cpp
@@ -18,7 +18,7 @@ void dummycommon::start()
 
     int dataRate = sensor()->dataRate();
     if (dataRate == 0) {
-        if (sensor()->availableDataRates().count())
+        if (sensor()->availableDataRates().size())
             // Use the first available rate when -1 is chosen
             dataRate = sensor()->availableDataRates().first().first;
         else
diff --git a/src/sensors/qsensor.cpp b/src/sensors/qsensor.cpp
index 839f795..fbd94e7 100644
--- a/src/sensors/qsensor.cpp
+++ b/src/sensors/qsensor.cpp
@@ -814,7 +814,7 @@ void QSensor::setOutputRange(int index)
         return;
     }
     bool warn = true;
-    if (index >= 0 && index < d->outputRanges.count()) {
+    if (index >= 0 && index < d->outputRanges.size()) {
         warn = false;
         d->outputRange = index;
     }
diff --git a/src/sensors/qsensormanager.cpp b/src/sensors/qsensormanager.cpp
index 7cdc1b2..b246aad 100644
--- a/src/sensors/qsensormanager.cpp
+++ b/src/sensors/qsensormanager.cpp
@@ -89,7 +89,7 @@ public:
                 //read out setting line
                 line.remove(QLatin1String(" "));
                 QStringList pair = line.split(QStringLiteral("="));
-                if (pair.count() == 2)
+                if (pair.size() == 2)
                     defaultIdentifierForType.insert(pair[0].toLatin1(), pair[1].toLatin1());
             }
         }
@@ -183,7 +183,7 @@ void QSensorManagerPrivate::loadPlugins()
     if (d->loadExternalPlugins) {
         SENSORLOG() << "initializing plugins";
         QList<QPluginParsedMetaData> meta = d->loader->metaData();
-        for (int i = 0; i < meta.count(); i++) {
+        for (int i = 0; i < meta.size(); i++) {
             QObject *plugin = d->loader->instance(i);
             initPlugin(plugin);
         }
@@ -271,7 +271,7 @@ void QSensorManager::unregisterBackend(const QByteArray &type, const QByteArray
 
     (void)factoryByIdentifier.take(identifier); // we don't own this pointer anyway
     if (d->firstIdentifierForType[type] == identifier) {
-        if (factoryByIdentifier.count()) {
+        if (factoryByIdentifier.size()) {
             d->firstIdentifierForType[type] = factoryByIdentifier.begin().key();
             if (d->firstIdentifierForType[type].startsWith("generic.")) {
                 // Don't let a generic backend be the default when some other backend exists!
@@ -287,7 +287,7 @@ void QSensorManager::unregisterBackend(const QByteArray &type, const QByteArray
             (void)d->firstIdentifierForType.take(type);
         }
     }
-    if (!factoryByIdentifier.count())
+    if (!factoryByIdentifier.size())
         (void)d->backendsByType.take(type);
 
     // Notify the app that the available sensor list has changed.
diff --git a/src/sensorsquick/qmlsensor.cpp b/src/sensorsquick/qmlsensor.cpp
index eb64f2e..1e37541 100644
--- a/src/sensorsquick/qmlsensor.cpp
+++ b/src/sensorsquick/qmlsensor.cpp
@@ -20,7 +20,7 @@ public:
 template<typename Item>
 qsizetype readonlyListCount(QQmlListProperty<Item> *p)
 {
-    return static_cast<const QList<Item *> *>(p->data)->count();
+    return static_cast<const QList<Item *> *>(p->data)->size();
 }
 
 template<typename Item>
@@ -453,9 +453,9 @@ void QmlSensor::componentComplete()
     // meta-data should become non-empty
     if (!description().isEmpty())
         Q_EMIT descriptionChanged();
-    if (available.count())
+    if (available.size())
         Q_EMIT availableDataRatesChanged();
-    if (output.count())
+    if (output.size())
         Q_EMIT outputRangesChanged();
 
     connect(sensor(), SIGNAL(readingChanged()), this, SLOT(updateReading()));
diff --git a/src/sensorsquick/qmlsensorglobal.cpp b/src/sensorsquick/qmlsensorglobal.cpp
index efc86de..73f865c 100644
--- a/src/sensorsquick/qmlsensorglobal.cpp
+++ b/src/sensorsquick/qmlsensorglobal.cpp
@@ -50,7 +50,7 @@ QStringList QmlSensorGlobal::sensorTypes() const
 {
     QStringList ret;
     const QList<QByteArray> sensorTypes = QSensor::sensorTypes();
-    ret.reserve(sensorTypes.count());
+    ret.reserve(sensorTypes.size());
     for (const QByteArray &type : sensorTypes)
         ret << QString::fromLocal8Bit(type);
     return ret;
@@ -66,7 +66,7 @@ QStringList QmlSensorGlobal::sensorsForType(const QString &type) const
 {
     QStringList ret;
     const QList<QByteArray> sensors = QSensor::sensorsForType(type.toLocal8Bit());
-    ret.reserve(sensors.count());
+    ret.reserve(sensors.size());
     for (const QByteArray &identifier : sensors)
         ret << QString::fromLocal8Bit(identifier);
     return ret;
diff --git a/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp b/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp
index bd32f34..ad823f7 100644
--- a/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp
+++ b/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp
@@ -389,11 +389,11 @@ void tst_sensors_qmlcpp::testSensorRanges()
     QSignalSpy output2Spy(output2, SIGNAL(destroyed()));
 
     qmlSensor.reset();
-    QCOMPARE(range0Spy.count(), 1);
-    QCOMPARE(range1Spy.count(), 1);
-    QCOMPARE(output0Spy.count(), 1);
-    QCOMPARE(output1Spy.count(), 1);
-    QCOMPARE(output2Spy.count(), 1);
+    QCOMPARE(range0Spy.size(), 1);
+    QCOMPARE(range1Spy.size(), 1);
+    QCOMPARE(output0Spy.size(), 1);
+    QCOMPARE(output1Spy.size(), 1);
+    QCOMPARE(output2Spy.size(), 1);
 }
 
 QT_END_NAMESPACE
diff --git a/tests/auto/qsensor/tst_qsensor.cpp b/tests/auto/qsensor/tst_qsensor.cpp
index 38251c5..528fca3 100644
--- a/tests/auto/qsensor/tst_qsensor.cpp
+++ b/tests/auto/qsensor/tst_qsensor.cpp
@@ -423,20 +423,20 @@ private slots:
         sensor.setProperty("doThis", "setOne");
         QSignalSpy spy(&sensor, SIGNAL(readingChanged()));
         sensor.start();
-        QCOMPARE(spy.count(), 1); // reading changes
+        QCOMPARE(spy.size(), 1); // reading changes
         sensor.stop();
 
         TestSensorFilter *filter2 = new MyFilter;
         sensor.addFilter(filter2);
         sensor.start();
-        QCOMPARE(spy.count(), 1); // filter suppresses reading so it does not change
+        QCOMPARE(spy.size(), 1); // filter suppresses reading so it does not change
         sensor.stop();
         delete filter2;
 
         TestSensorFilter *filter1 = new ModFilter;
         sensor.addFilter(filter1);
         sensor.start();
-        QCOMPARE(spy.count(), 2); // filter does not suppress reading
+        QCOMPARE(spy.size(), 2); // filter does not suppress reading
         sensor.stop();
         delete filter1;
     }
@@ -895,7 +895,7 @@ private slots:
         // Stopping the first instance causes the busyChanged signal to be emitted from the second instance
         QSignalSpy spy(&sensor2, SIGNAL(busyChanged()));
         sensor1.stop();
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
 
         // Now we can start the second instance
         sensor2.start();
@@ -908,14 +908,14 @@ private slots:
         QSignalSpy busySpy(&accelerometer, SIGNAL(busyChanged()));
         QVERIFY(accelerometer.connectToBackend());
         QVERIFY(!accelerometer.isBusy());
-        QCOMPARE(busySpy.count(), 0);
+        QCOMPARE(busySpy.size(), 0);
 
         set_test_backend_busy(&accelerometer, true);
-        QCOMPARE(busySpy.count(), 1);
+        QCOMPARE(busySpy.size(), 1);
         QVERIFY(accelerometer.isBusy());
 
         set_test_backend_busy(&accelerometer, false);
-        QCOMPARE(busySpy.count(), 2);
+        QCOMPARE(busySpy.size(), 2);
         QVERIFY(!accelerometer.isBusy());
         unregister_test_backends();
     }
@@ -929,23 +929,23 @@ private slots:
       // Change id and verify change
       sensor.setIdentifier("a");
       QCOMPARE(sensor.identifier(), "a");
-      QCOMPARE(spy.count(), 1);
+      QCOMPARE(spy.size(), 1);
 
       // Set same id and verify that no changes
       sensor.setIdentifier("a");
       QCOMPARE(sensor.identifier(), "a");
-      QCOMPARE(spy.count(), 1);
+      QCOMPARE(spy.size(), 1);
 
       // Change id and verify change
       sensor.setIdentifier(testsensorimpl::id);
       QCOMPARE(sensor.identifier(), testsensorimpl::id);
-      QCOMPARE(spy.count(), 2);
+      QCOMPARE(spy.size(), 2);
 
       // Identifier cant be changed after connected to backend
       QVERIFY(sensor.connectToBackend());
       sensor.setIdentifier("c");
       QCOMPARE(sensor.identifier(), testsensorimpl::id);
-      QCOMPARE(spy.count(), 2);
+      QCOMPARE(spy.size(), 2);
     }
 
     void testSupportedFeatures()