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>

4 files changed, 27 insertions, 27 deletions

diff --git a/src/mqtt/qmqttconnection.cpp b/src/mqtt/qmqttconnection.cpp
index 41f2de9..6650ef3 100644
--- a/src/mqtt/qmqttconnection.cpp
+++ b/src/mqtt/qmqttconnection.cpp
@@ -1599,7 +1599,7 @@ void QMqttConnection::finalize_publish()
 {
     // String topic
     QMqttTopicName topic = readBufferTyped<QString>(&m_missingData);
-    const int topicLength = topic.name().length();
+    const int topicLength = topic.name().size();
 
     quint16 id = 0;
     if (m_currentPublish.qos > 0)
diff --git a/tests/auto/qmqttclient/tst_qmqttclient.cpp b/tests/auto/qmqttclient/tst_qmqttclient.cpp
index 6ca5f14..6c88b61 100644
--- a/tests/auto/qmqttclient/tst_qmqttclient.cpp
+++ b/tests/auto/qmqttclient/tst_qmqttclient.cpp
@@ -220,7 +220,7 @@ void Tst_QMqttClient::retainMessage()
 
         QSignalSpy publishSpy(&publisher, SIGNAL(messageSent(qint32)));
         publisher.publish(testTopic, testMessage, 1, i == 1 ? true : false);
-        QTRY_COMPARE(publishSpy.count(), 1);
+        QTRY_COMPARE(publishSpy.size(), 1);
 
         VersionClient(mqttVersion, sub);
         sub.setClientId(QLatin1String("SubA"));
@@ -310,7 +310,7 @@ void Tst_QMqttClient::willMessage()
         else
             willClient.disconnectFromHost();
         QTest::qWait(500);
-        QTRY_COMPARE(messageSpy.count(), i);
+        QTRY_COMPARE(messageSpy.size(), i);
     }
 }
 
@@ -665,7 +665,7 @@ void Tst_QMqttClient::messageStatus()
 
     QSignalSpy publishSpy(&client, &QMqttClient::messageSent);
     client.publish(topic, QByteArray("someContent"), quint8(qos));
-    QTRY_VERIFY2(publishSpy.count() == 1, "Could not publish message");
+    QTRY_VERIFY2(publishSpy.size() == 1, "Could not publish message");
     QTRY_VERIFY2(expectedStatus.isEmpty(), "Did not receive all status updates.");
 }
 
@@ -718,8 +718,8 @@ void Tst_QMqttClient::messageStatusReceive()
     QSignalSpy receiveSpy(&subscriber, &QMqttClient::messageReceived);
 
     publisher.publish(topic, QByteArray("someContent"), quint8(qos));
-    QTRY_VERIFY2(publishSpy.count() == 1, "Could not publish message");
-    QTRY_VERIFY2(receiveSpy.count() == 1, "Did not receive message");
+    QTRY_VERIFY2(publishSpy.size() == 1, "Could not publish message");
+    QTRY_VERIFY2(receiveSpy.size() == 1, "Did not receive message");
 
     QTRY_VERIFY2(expectedStatus.isEmpty(), "Did not receive all status updates.");
 }
@@ -803,7 +803,7 @@ void Tst_QMqttClient::subscriptionIdsOverlap()
 
     QSignalSpy publishSpy(&pub, &QMqttClient::messageSent);
     pub.publish(topic, "SomeData", 1);
-    QTRY_VERIFY2(publishSpy.count() == 1, "Could not finalize publication.");
+    QTRY_VERIFY2(publishSpy.size() == 1, "Could not finalize publication.");
     QTRY_VERIFY2(receiveBCounter == 0, "Did not receive both messages.");
     QTRY_VERIFY2(receiveB2Counter == 0, "Did not receive both messages.");
     QTRY_VERIFY2(receiveACounter == 1, "Did not receive non-overlapping message.");
@@ -848,7 +848,7 @@ void Tst_QMqttClient::keepAlive()
 
     // Verify auto keep alive works
     QSignalSpy spy(&client, &QMqttClient::pingResponseReceived);
-    QTRY_VERIFY_WITH_TIMEOUT(spy.count() == 5, keepAlive * 1000 * 5 * 2);
+    QTRY_VERIFY_WITH_TIMEOUT(spy.size() == 5, keepAlive * 1000 * 5 * 2);
     spy.clear();
 
     client.disconnectFromHost();
@@ -880,7 +880,7 @@ void Tst_QMqttClient::keepAlive()
     client.connectToHost();
     QTRY_COMPARE(client.state(), QMqttClient::Connected);
 
-    QTRY_VERIFY_WITH_TIMEOUT(spy.count() == 5, keepAlive * 1000 * 5 * 2);
+    QTRY_VERIFY_WITH_TIMEOUT(spy.size() == 5, keepAlive * 1000 * 5 * 2);
 
     client.disconnectFromHost();
     QTRY_COMPARE(client.state(), QMqttClient::Disconnected);
diff --git a/tests/auto/qmqttconnectionproperties/tst_qmqttconnectionproperties.cpp b/tests/auto/qmqttconnectionproperties/tst_qmqttconnectionproperties.cpp
index 7723f45..30f9ea4 100644
--- a/tests/auto/qmqttconnectionproperties/tst_qmqttconnectionproperties.cpp
+++ b/tests/auto/qmqttconnectionproperties/tst_qmqttconnectionproperties.cpp
@@ -189,17 +189,17 @@ void tst_QMqttConnectionProperties::maximumPacketSize()
 
     QSignalSpy publishSpy(&client, SIGNAL(messageSent(qint32)));
     client.publish(topic, shortData, 1);
-    QTRY_COMPARE(publishSpy.count(), 1);
+    QTRY_COMPARE(publishSpy.size(), 1);
 
-    QTRY_COMPARE(subscribeSpy.count(), 1);
+    QTRY_COMPARE(subscribeSpy.size(), 1);
 
     client.publish(topic, overFlowData, 1);
-    QTRY_COMPARE(publishSpy.count(), 1);
+    QTRY_COMPARE(publishSpy.size(), 1);
 
     // We defined maximum size to receive is 500, hence the message should not be sent back
     // to us. Wait for some time and verify no message got sent to subscriber
     QTest::qWait(3000);
-    QTRY_COMPARE(subscribeSpy.count(), 1);
+    QTRY_COMPARE(subscribeSpy.size(), 1);
 }
 
 void tst_QMqttConnectionProperties::maximumTopicAlias()
@@ -240,9 +240,9 @@ void tst_QMqttConnectionProperties::maximumTopicAlias()
 
         QMqttTopicName topic(topicBase + QString::number(i));
         client.publish(topic, msgContent, 1);
-        QTRY_VERIFY(publishSpy.count() == 1);
+        QTRY_VERIFY(publishSpy.size() == 1);
 
-        QVERIFY(transportSpy.count() == 1);
+        QVERIFY(transportSpy.size() == 1);
         const int dataSize = transportSpy.at(0).at(0).toInt();
         if (publishTransportSize == 0) {
             publishTransportSize = dataSize;
@@ -256,8 +256,8 @@ void tst_QMqttConnectionProperties::maximumTopicAlias()
     QSignalSpy fullSpy(&client, SIGNAL(messageSent(qint32)));
     transportSpy.clear();
     client.publish(QLatin1String("Qt/connprop/alias/full/with/long/topic/to/verify/bigger/size"), msgContent, 1);
-    QTRY_VERIFY(fullSpy.count() == 1);
-    QVERIFY(transportSpy.count() == 1);
+    QTRY_VERIFY(fullSpy.size() == 1);
+    QVERIFY(transportSpy.size() == 1);
     QVERIFY(transportSpy.at(0).at(0).toInt() > publishTransportSize);
 
     // Verify alias is used at sending second time
@@ -265,8 +265,8 @@ void tst_QMqttConnectionProperties::maximumTopicAlias()
     fullSpy.clear();
 
     client.publish(topicBase + QLatin1String("0"), msgContent, 1);
-    QTRY_VERIFY(fullSpy.count() == 1);
-    QVERIFY(transportSpy.count() == 1);
+    QTRY_VERIFY(fullSpy.size() == 1);
+    QVERIFY(transportSpy.size() == 1);
     int usageSize = transportSpy.at(0).at(0).toInt();
     QVERIFY(usageSize < publishTransportSize);
 
@@ -277,16 +277,16 @@ void tst_QMqttConnectionProperties::maximumTopicAlias()
     fullSpy.clear();
     transportSpy.clear();
     client.publish(overwrite, overProp, msgContent, 1);
-    QTRY_VERIFY(fullSpy.count() == 1);
-    QVERIFY(transportSpy.count() == 1);
+    QTRY_VERIFY(fullSpy.size() == 1);
+    QVERIFY(transportSpy.size() == 1);
     const int overwriteSize = transportSpy.at(0).at(0).toInt();
     QVERIFY(overwriteSize > publishTransportSize);
     // After resend new alias should be used and msg size reduced
     fullSpy.clear();
     transportSpy.clear();
     client.publish(overwrite, msgContent, 1);
-    QTRY_VERIFY(fullSpy.count() == 1);
-    QVERIFY(transportSpy.count() == 1);
+    QTRY_VERIFY(fullSpy.size() == 1);
+    QVERIFY(transportSpy.size() == 1);
     usageSize = transportSpy.at(0).at(0).toInt();
     QVERIFY(usageSize < overwriteSize);
 }
@@ -333,12 +333,12 @@ void tst_QMqttConnectionProperties::maximumTopicAliasReceive()
     QSignalSpy publishSpy(&client, &QMqttClient::messageSent);
     //QLoggingCategory::setFilterRules("qt.mqtt.connection*=true");
     client.publish(topic, msgContent, 1);
-    QTRY_VERIFY2(publishSpy.count() == 1, "Could not publish");
+    QTRY_VERIFY2(publishSpy.size() == 1, "Could not publish");
     QTRY_VERIFY2(receiveCounter == 1, "Did not receive initial message");
 
     publishSpy.clear();
     client.publish(topic, msgContent, 1);
-    QTRY_VERIFY2(publishSpy.count() == 1, "Could not publish");
+    QTRY_VERIFY2(publishSpy.size() == 1, "Could not publish");
     QTRY_VERIFY2(receiveCounter == 2, "Did not receive second aliases message");
 }
 
diff --git a/tests/auto/qmqttpublishproperties/tst_qmqttpublishproperties.cpp b/tests/auto/qmqttpublishproperties/tst_qmqttpublishproperties.cpp
index 1c13e83..c722a8f 100644
--- a/tests/auto/qmqttpublishproperties/tst_qmqttpublishproperties.cpp
+++ b/tests/auto/qmqttpublishproperties/tst_qmqttpublishproperties.cpp
@@ -159,8 +159,8 @@ void tst_QMqttPublishProperties::propertyConsistency()
     QSignalSpy subscribeSpy(sub, SIGNAL(messageReceived(QMqttMessage)));
     client.publish(testTopic, pubProp, QByteArray("Some Content"), 1);
 
-    QTRY_COMPARE(publishSpy.count(), 1);
-    QTRY_COMPARE(subscribeSpy.count(), 1);
+    QTRY_COMPARE(publishSpy.size(), 1);
+    QTRY_COMPARE(subscribeSpy.size(), 1);
 
     auto msg = subscribeSpy.at(0).at(0).value<QMqttMessage>();