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>

5 files changed, 64 insertions, 64 deletions

diff --git a/tests/auto/network/socket/qhttpsocketengine/tst_qhttpsocketengine.cpp b/tests/auto/network/socket/qhttpsocketengine/tst_qhttpsocketengine.cpp
index 63bd17f130..c9bf8b92f3 100644
--- a/tests/auto/network/socket/qhttpsocketengine/tst_qhttpsocketengine.cpp
+++ b/tests/auto/network/socket/qhttpsocketengine/tst_qhttpsocketengine.cpp
@@ -83,9 +83,9 @@ public slots:
         int idx = client->property("dataTransmitionIdx").toInt();
         if (receivedData.contains("\r\n\r\n") ||
             receivedData.contains("\n\n")) {
-            if (idx < dataToTransmit.length())
+            if (idx < dataToTransmit.size())
                 client->write(dataToTransmit.at(idx++));
-            if (idx == dataToTransmit.length()) {
+            if (idx == dataToTransmit.size()) {
                 client->disconnectFromHost();
                 disconnect(client, 0, this, 0);
                 client = 0;
diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
index 9b8fec384c..656b506a85 100644
--- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
@@ -245,7 +245,7 @@ void tst_QLocalSocket::server_basic()
     QVERIFY(!timedOut);
     QCOMPARE(server.listen(QString()), false);
 
-    QCOMPARE(server.hits.count(), 0);
+    QCOMPARE(server.hits.size(), 0);
     QCOMPARE(spyNewConnection.count(), 0);
 }
 
@@ -321,7 +321,7 @@ void tst_QLocalSocket::listen()
     QCOMPARE(server.isListening(), canListen);
     QCOMPARE(server.hasPendingConnections(), false);
     QCOMPARE(server.nextPendingConnection(), (QLocalSocket*)0);
-    QCOMPARE(server.hits.count(), 0);
+    QCOMPARE(server.hits.size(), 0);
     QCOMPARE(spyNewConnection.count(), 0);
     if (canListen) {
         QVERIFY(server.errorString().isEmpty());
@@ -451,7 +451,7 @@ void tst_QLocalSocket::listenAndConnect()
             QCOMPARE(server.serverName(), name);
             QVERIFY(server.fullServerName().contains(name));
             QVERIFY(server.nextPendingConnection() != (QLocalSocket*)0);
-            QTRY_COMPARE(server.hits.count(), i + 1);
+            QTRY_COMPARE(server.hits.size(), i + 1);
             QCOMPARE(spyNewConnection.count(), i + 1);
             QVERIFY(server.errorString().isEmpty());
             QCOMPARE(server.serverError(), QAbstractSocket::UnknownSocketError);
@@ -460,7 +460,7 @@ void tst_QLocalSocket::listenAndConnect()
             QVERIFY(server.fullServerName().isEmpty());
             QCOMPARE(server.nextPendingConnection(), (QLocalSocket*)0);
             QCOMPARE(spyNewConnection.count(), 0);
-            QCOMPARE(server.hits.count(), 0);
+            QCOMPARE(server.hits.size(), 0);
             QVERIFY(!server.errorString().isEmpty());
             QCOMPARE(server.serverError(), QAbstractSocket::HostNotFoundError);
         }
@@ -469,7 +469,7 @@ void tst_QLocalSocket::listenAndConnect()
 
     server.close();
 
-    QCOMPARE(server.hits.count(), (canListen ? connections : 0));
+    QCOMPARE(server.hits.size(), (canListen ? connections : 0));
     QCOMPARE(spyNewConnection.count(), (canListen ? connections : 0));
 }
 
@@ -705,7 +705,7 @@ void tst_QLocalSocket::sendData()
 
     server.close();
 
-    QCOMPARE(server.hits.count(), (canListen ? 1 : 0));
+    QCOMPARE(server.hits.size(), (canListen ? 1 : 0));
     QCOMPARE(spy.count(), (canListen ? 1 : 0));
 }
 
@@ -1068,7 +1068,7 @@ void tst_QLocalSocket::hitMaximumConnections()
    bool timedOut = true;
    QVERIFY(server.waitForNewConnection(3000, &timedOut));
    QVERIFY(!timedOut);
-   QVERIFY(server.hits.count() > 0);
+   QVERIFY(server.hits.size() > 0);
    qDeleteAll(sockets.begin(), sockets.end());
 }
 
@@ -1140,7 +1140,7 @@ public:
             --done;
             delete serverSocket;
         }
-        QCOMPARE(server.hits.count(), clients);
+        QCOMPARE(server.hits.size(), clients);
     }
 };
 
diff --git a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
index 3ce1153031..aa860893bb 100644
--- a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
+++ b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
@@ -915,13 +915,13 @@ void tst_QSocks5SocketEngine::fragmentation_data()
     responses << authMethodBasic << authSuccess.left(1) << authSuccess.mid(1) << connectResponseIPv4;
     QTest::newRow("auth-response") << responses;
 
-    for (int i = 1; i < connectResponseIPv4.length() - 1; i++) {
+    for (int i = 1; i < connectResponseIPv4.size() - 1; i++) {
         responses.clear();
         responses << authMethodNone << connectResponseIPv4.left(i) << connectResponseIPv4.mid(i);
         QTest::newRow(qPrintable(QString("connect-response-ipv4-") + QString::number(i))) << responses;
     }
 
-    for (int i = 1; i < connectResponseIPv6.length() - 1; i++) {
+    for (int i = 1; i < connectResponseIPv6.size() - 1; i++) {
         responses.clear();
         responses << authMethodNone << connectResponseIPv6.left(i) << connectResponseIPv6.mid(i);
         QTest::newRow(qPrintable(QString("connect-response-ipv6-") + QString::number(i))) << responses;
@@ -964,13 +964,13 @@ void tst_QSocks5SocketEngine::incomplete_data()
     responses << authMethodBasic << authSuccess.left(1);
     QTest::newRow("auth-response") << responses;
 
-    for (int i = 1; i < connectResponseIPv4.length() - 1; i++) {
+    for (int i = 1; i < connectResponseIPv4.size() - 1; i++) {
         responses.clear();
         responses << authMethodNone << connectResponseIPv4.left(i);
         QTest::newRow(qPrintable(QString("connect-response-ipv4-") + QString::number(i))) << responses;
     }
 
-    for (int i = 1; i < connectResponseIPv6.length() - 1; i++) {
+    for (int i = 1; i < connectResponseIPv6.size() - 1; i++) {
         responses.clear();
         responses << authMethodNone << connectResponseIPv6.left(i);
         QTest::newRow(qPrintable(QString("connect-response-ipv6-") + QString::number(i))) << responses;
diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
index 981160ce6b..bf933406a6 100644
--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
@@ -347,8 +347,8 @@ void tst_QTcpSocket::init()
         QFETCH_GLOBAL(int, proxyType);
         QList<QHostAddress> socks5Addresses = QHostInfo::fromName(QtNetworkSettings::socksProxyServerName()).addresses();
         QList<QHostAddress> httpProxyAddresses = QHostInfo::fromName(QtNetworkSettings::httpProxyServerName()).addresses();
-        QVERIFY2(socks5Addresses.count() > 0, "failed to get ip address for SOCKS5 proxy server");
-        QVERIFY2(httpProxyAddresses.count() > 0, "failed to get ip address for HTTP proxy server");
+        QVERIFY2(socks5Addresses.size() > 0, "failed to get ip address for SOCKS5 proxy server");
+        QVERIFY2(httpProxyAddresses.size() > 0, "failed to get ip address for HTTP proxy server");
         QString socks5Address = socks5Addresses.first().toString();
         QString httpProxyAddress = httpProxyAddresses.first().toString();
         QNetworkProxy proxy;
@@ -1823,7 +1823,7 @@ void tst_QTcpSocket::atEnd()
     QVERIFY2(greeting.startsWith("220 (vsFTPd 3."), qPrintable(greeting));
 #else
     // Test server must use some vsFTPd 2.x.x version
-    QVERIFY2(greeting.length() == sizeof("220 (vsFTPd 2.x.x)")-1, qPrintable(greeting));
+    QVERIFY2(greeting.size() == sizeof("220 (vsFTPd 2.x.x)")-1, qPrintable(greeting));
     QVERIFY2(greeting.startsWith("220 (vsFTPd 2."), qPrintable(greeting));
 #endif
     QVERIFY2(greeting.endsWith(QLatin1Char(')')), qPrintable(greeting));
diff --git a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
index 336b528567..7ad2259f1a 100644
--- a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
+++ b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
@@ -386,7 +386,7 @@ void tst_QUdpSocket::broadcasting()
     foreach (QNetworkInterface iface, QNetworkInterface::allInterfaces()) {
         if ((iface.flags() & QNetworkInterface::CanBroadcast)
             && iface.flags() & QNetworkInterface::IsUp) {
-            for (int i=0;i<iface.addressEntries().count();i++) {
+            for (int i=0;i<iface.addressEntries().size();i++) {
                 QHostAddress broadcast = iface.addressEntries().at(i).broadcast();
                 if (broadcast.protocol() == QAbstractSocket::IPv4Protocol)
                     broadcastAddresses.append(broadcast);
@@ -431,7 +431,7 @@ void tst_QUdpSocket::broadcasting()
                 QVERIFY(dgram.isValid());
                 QByteArray arr = dgram.data();
 
-                QCOMPARE(arr.length(), messageLength);
+                QCOMPARE(arr.size(), messageLength);
                 arr.resize(messageLength);
                 QCOMPARE(arr, QByteArray(message[i]));
 
@@ -491,27 +491,27 @@ void tst_QUdpSocket::loop()
     QHostAddress peterAddress = makeNonAny(peter.localAddress());
     QHostAddress paulAddress = makeNonAny(paul.localAddress());
 
-    QCOMPARE(peter.writeDatagram(peterMessage.data(), peterMessage.length(),
-                                paulAddress, paul.localPort()), qint64(peterMessage.length()));
-    QCOMPARE(paul.writeDatagram(paulMessage.data(), paulMessage.length(),
-                               peterAddress, peter.localPort()), qint64(paulMessage.length()));
+    QCOMPARE(peter.writeDatagram(peterMessage.data(), peterMessage.size(),
+                                paulAddress, paul.localPort()), qint64(peterMessage.size()));
+    QCOMPARE(paul.writeDatagram(paulMessage.data(), paulMessage.size(),
+                               peterAddress, peter.localPort()), qint64(paulMessage.size()));
 
     QVERIFY2(peter.waitForReadyRead(9000), QtNetworkSettings::msgSocketError(peter).constData());
     QVERIFY2(paul.waitForReadyRead(9000), QtNetworkSettings::msgSocketError(paul).constData());
 
-    QNetworkDatagram peterDatagram = peter.receiveDatagram(paulMessage.length() * 2);
-    QNetworkDatagram paulDatagram = paul.receiveDatagram(peterMessage.length() * 2);
+    QNetworkDatagram peterDatagram = peter.receiveDatagram(paulMessage.size() * 2);
+    QNetworkDatagram paulDatagram = paul.receiveDatagram(peterMessage.size() * 2);
     if (success) {
-        QCOMPARE(peterDatagram.data().length(), qint64(paulMessage.length()));
-        QCOMPARE(paulDatagram.data().length(), qint64(peterMessage.length()));
+        QCOMPARE(peterDatagram.data().size(), qint64(paulMessage.size()));
+        QCOMPARE(paulDatagram.data().size(), qint64(peterMessage.size()));
     } else {
         // this code path seems to never be executed
-        QVERIFY(peterDatagram.data().length() != paulMessage.length());
-        QVERIFY(paulDatagram.data().length() != peterMessage.length());
+        QVERIFY(peterDatagram.data().size() != paulMessage.size());
+        QVERIFY(paulDatagram.data().size() != peterMessage.size());
     }
 
-    QCOMPARE(peterDatagram.data().left(paulMessage.length()), paulMessage);
-    QCOMPARE(paulDatagram.data().left(peterMessage.length()), peterMessage);
+    QCOMPARE(peterDatagram.data().left(paulMessage.size()), paulMessage);
+    QCOMPARE(paulDatagram.data().left(peterMessage.size()), peterMessage);
 
     QCOMPARE(peterDatagram.senderAddress(), paulAddress);
     QCOMPARE(paulDatagram.senderAddress(), peterAddress);
@@ -568,27 +568,27 @@ void tst_QUdpSocket::ipv6Loop()
     peterPort = peter.localPort();
     paulPort = paul.localPort();
 
-    QCOMPARE(peter.writeDatagram(peterMessage.data(), peterMessage.length(), QHostAddress("::1"),
-                                    paulPort), qint64(peterMessage.length()));
-    QCOMPARE(paul.writeDatagram(paulMessage.data(), paulMessage.length(),
-                                   QHostAddress("::1"), peterPort), qint64(paulMessage.length()));
+    QCOMPARE(peter.writeDatagram(peterMessage.data(), peterMessage.size(), QHostAddress("::1"),
+                                    paulPort), qint64(peterMessage.size()));
+    QCOMPARE(paul.writeDatagram(paulMessage.data(), paulMessage.size(),
+                                   QHostAddress("::1"), peterPort), qint64(paulMessage.size()));
 
     QVERIFY(peter.waitForReadyRead(5000));
     QVERIFY(paul.waitForReadyRead(5000));
-    QNetworkDatagram peterDatagram = peter.receiveDatagram(paulMessage.length() * 2);
-    QNetworkDatagram paulDatagram = paul.receiveDatagram(peterMessage.length() * 2);
+    QNetworkDatagram peterDatagram = peter.receiveDatagram(paulMessage.size() * 2);
+    QNetworkDatagram paulDatagram = paul.receiveDatagram(peterMessage.size() * 2);
 
     if (success) {
-        QCOMPARE(peterDatagram.data().length(), qint64(paulMessage.length()));
-        QCOMPARE(paulDatagram.data().length(), qint64(peterMessage.length()));
+        QCOMPARE(peterDatagram.data().size(), qint64(paulMessage.size()));
+        QCOMPARE(paulDatagram.data().size(), qint64(peterMessage.size()));
     } else {
         // this code path seems to never be executed
-        QVERIFY(peterDatagram.data().length() != paulMessage.length());
-        QVERIFY(paulDatagram.data().length() != peterMessage.length());
+        QVERIFY(peterDatagram.data().size() != paulMessage.size());
+        QVERIFY(paulDatagram.data().size() != peterMessage.size());
     }
 
-    QCOMPARE(peterDatagram.data().left(paulMessage.length()), paulMessage);
-    QCOMPARE(paulDatagram.data().left(peterMessage.length()), peterMessage);
+    QCOMPARE(peterDatagram.data().left(paulMessage.size()), paulMessage);
+    QCOMPARE(paulDatagram.data().left(peterMessage.size()), peterMessage);
 
     QCOMPARE(peterDatagram.senderAddress(), paulAddress);
     QCOMPARE(paulDatagram.senderAddress(), peterAddress);
@@ -616,7 +616,7 @@ void tst_QUdpSocket::dualStack()
     QVERIFY(v4Sock.bind(QHostAddress(QHostAddress::AnyIPv4), 0));
 
     //test v4 -> dual
-    QCOMPARE((int)v4Sock.writeDatagram(v4Data.constData(), v4Data.length(), QHostAddress(QHostAddress::LocalHost), dualSock.localPort()), v4Data.length());
+    QCOMPARE((int)v4Sock.writeDatagram(v4Data.constData(), v4Data.size(), QHostAddress(QHostAddress::LocalHost), dualSock.localPort()), v4Data.size());
     QVERIFY2(dualSock.waitForReadyRead(5000), QtNetworkSettings::msgSocketError(dualSock).constData());
     QNetworkDatagram dgram = dualSock.receiveDatagram(100);
     QVERIFY(dgram.isValid());
@@ -639,7 +639,7 @@ void tst_QUdpSocket::dualStack()
         QVERIFY(v6Sock.bind(QHostAddress(QHostAddress::AnyIPv6), 0));
 
         //test v6 -> dual
-        QCOMPARE((int)v6Sock.writeDatagram(v6Data.constData(), v6Data.length(), QHostAddress(QHostAddress::LocalHostIPv6), dualSock.localPort()), v6Data.length());
+        QCOMPARE((int)v6Sock.writeDatagram(v6Data.constData(), v6Data.size(), QHostAddress(QHostAddress::LocalHostIPv6), dualSock.localPort()), v6Data.size());
         QVERIFY2(dualSock.waitForReadyRead(5000), QtNetworkSettings::msgSocketError(dualSock).constData());
         dgram = dualSock.receiveDatagram(100);
         QVERIFY(dgram.isValid());
@@ -650,7 +650,7 @@ void tst_QUdpSocket::dualStack()
         QCOMPARE(dgram.destinationAddress(), makeNonAny(dualSock.localAddress(), QHostAddress::LocalHostIPv6));
 
         //test dual -> v6
-        QCOMPARE((int)dualSock.writeDatagram(dualData.constData(), dualData.length(), QHostAddress(QHostAddress::LocalHostIPv6), v6Sock.localPort()), dualData.length());
+        QCOMPARE((int)dualSock.writeDatagram(dualData.constData(), dualData.size(), QHostAddress(QHostAddress::LocalHostIPv6), v6Sock.localPort()), dualData.size());
         QVERIFY2(v6Sock.waitForReadyRead(5000), QtNetworkSettings::msgSocketError(v6Sock).constData());
         dgram = v6Sock.receiveDatagram(100);
         QVERIFY(dgram.isValid());
@@ -662,7 +662,7 @@ void tst_QUdpSocket::dualStack()
     }
 
     //test dual -> v4
-    QCOMPARE((int)dualSock.writeDatagram(dualData.constData(), dualData.length(), QHostAddress(QHostAddress::LocalHost), v4Sock.localPort()), dualData.length());
+    QCOMPARE((int)dualSock.writeDatagram(dualData.constData(), dualData.size(), QHostAddress(QHostAddress::LocalHost), v4Sock.localPort()), dualData.size());
     QVERIFY2(v4Sock.waitForReadyRead(5000), QtNetworkSettings::msgSocketError(v4Sock).constData());
     dgram = v4Sock.receiveDatagram(100);
     QVERIFY(dgram.isValid());
@@ -701,19 +701,19 @@ void tst_QUdpSocket::dualStackAutoBinding()
         //test an autobound socket can send to both v4 and v6 addresses (v4 first)
         QUdpSocket dualSock;
 
-        QCOMPARE((int)dualSock.writeDatagram(dualData.constData(), dualData.length(), QHostAddress(QHostAddress::LocalHost), v4Sock.localPort()), dualData.length());
+        QCOMPARE((int)dualSock.writeDatagram(dualData.constData(), dualData.size(), QHostAddress(QHostAddress::LocalHost), v4Sock.localPort()), dualData.size());
         QVERIFY2(v4Sock.waitForReadyRead(5000), QtNetworkSettings::msgSocketError(v4Sock).constData());
         buffer.reserve(100);
         size = v4Sock.readDatagram(buffer.data(), 100, &from, &port);
-        QCOMPARE((int)size, dualData.length());
+        QCOMPARE((int)size, dualData.size());
         buffer.resize(size);
         QCOMPARE(buffer, dualData);
 
-        QCOMPARE((int)dualSock.writeDatagram(dualData.constData(), dualData.length(), QHostAddress(QHostAddress::LocalHostIPv6), v6Sock.localPort()), dualData.length());
+        QCOMPARE((int)dualSock.writeDatagram(dualData.constData(), dualData.size(), QHostAddress(QHostAddress::LocalHostIPv6), v6Sock.localPort()), dualData.size());
         QVERIFY2(v6Sock.waitForReadyRead(5000), QtNetworkSettings::msgSocketError(v6Sock).constData());
         buffer.reserve(100);
         size = v6Sock.readDatagram(buffer.data(), 100, &from, &port);
-        QCOMPARE((int)size, dualData.length());
+        QCOMPARE((int)size, dualData.size());
         buffer.resize(size);
         QCOMPARE(buffer, dualData);
     }
@@ -722,19 +722,19 @@ void tst_QUdpSocket::dualStackAutoBinding()
         //test an autobound socket can send to both v4 and v6 addresses (v6 first)
         QUdpSocket dualSock;
 
-        QCOMPARE((int)dualSock.writeDatagram(dualData.constData(), dualData.length(), QHostAddress(QHostAddress::LocalHostIPv6), v6Sock.localPort()), dualData.length());
+        QCOMPARE((int)dualSock.writeDatagram(dualData.constData(), dualData.size(), QHostAddress(QHostAddress::LocalHostIPv6), v6Sock.localPort()), dualData.size());
         QVERIFY2(v6Sock.waitForReadyRead(5000), QtNetworkSettings::msgSocketError(v6Sock).constData());
         buffer.reserve(100);
         size = v6Sock.readDatagram(buffer.data(), 100, &from, &port);
-        QCOMPARE((int)size, dualData.length());
+        QCOMPARE((int)size, dualData.size());
         buffer.resize(size);
         QCOMPARE(buffer, dualData);
 
-        QCOMPARE((int)dualSock.writeDatagram(dualData.constData(), dualData.length(), QHostAddress(QHostAddress::LocalHost), v4Sock.localPort()), dualData.length());
+        QCOMPARE((int)dualSock.writeDatagram(dualData.constData(), dualData.size(), QHostAddress(QHostAddress::LocalHost), v4Sock.localPort()), dualData.size());
         QVERIFY2(v4Sock.waitForReadyRead(5000), QtNetworkSettings::msgSocketError(v4Sock).constData());
         buffer.reserve(100);
         size = v4Sock.readDatagram(buffer.data(), 100, &from, &port);
-        QCOMPARE((int)size, dualData.length());
+        QCOMPARE((int)size, dualData.size());
         buffer.resize(size);
         QCOMPARE(buffer, dualData);
     }
@@ -755,7 +755,7 @@ void tst_QUdpSocket::dualStackNoIPv4onV6only()
     QVERIFY(v6Sock.bind(QHostAddress(QHostAddress::AnyIPv6), 0));
 
     //test v4 -> v6 (should not be received as this is a v6 only socket)
-    QCOMPARE((int)v4Sock.writeDatagram(v4Data.constData(), v4Data.length(), QHostAddress(QHostAddress::LocalHost), v6Sock.localPort()), v4Data.length());
+    QCOMPARE((int)v4Sock.writeDatagram(v4Data.constData(), v4Data.size(), QHostAddress(QHostAddress::LocalHost), v6Sock.localPort()), v4Data.size());
     QVERIFY(!v6Sock.waitForReadyRead(1000));
 }
 
@@ -1550,7 +1550,7 @@ void tst_QUdpSocket::echo()
 {
     QFETCH(bool, connect);
     QHostInfo info = QHostInfo::fromName(QtNetworkSettings::echoServerName());
-    QVERIFY(info.addresses().count());
+    QVERIFY(info.addresses().size());
     QHostAddress remote = info.addresses().first();
 
     QUdpSocket sock;
@@ -1577,7 +1577,7 @@ void tst_QUdpSocket::echo()
                     in = sock.read(sock.pendingDatagramSize());
                 } else {
                     in.resize(sock.pendingDatagramSize());
-                    sock.readDatagram(in.data(), in.length(), &from, &port);
+                    sock.readDatagram(in.data(), in.size(), &from, &port);
                 }
                 if (in==out)
                     successes++;
@@ -1649,19 +1649,19 @@ void tst_QUdpSocket::linkLocalIPv6()
         QVERIFY(s->writeDatagram(testData, s->localAddress(), neutral.localPort()));
         QTRY_VERIFY(neutralReadSpy.count() > 0); //note may need to accept a firewall prompt
 
-        QNetworkDatagram dgram = neutral.receiveDatagram(testData.length() * 2);
+        QNetworkDatagram dgram = neutral.receiveDatagram(testData.size() * 2);
         QVERIFY(dgram.isValid());
         QCOMPARE(dgram.senderAddress(), s->localAddress());
         QCOMPARE(dgram.senderPort(), int(s->localPort()));
         QCOMPARE(dgram.destinationAddress(), s->localAddress());
         QCOMPARE(dgram.destinationPort(), int(neutral.localPort()));
-        QCOMPARE(dgram.data().length(), testData.length());
+        QCOMPARE(dgram.data().size(), testData.size());
         QCOMPARE(dgram.data(), testData);
 
         QVERIFY(neutral.writeDatagram(dgram.makeReply(testData)));
         QTRY_VERIFY(spy.count() > 0); //note may need to accept a firewall prompt
 
-        dgram = s->receiveDatagram(testData.length() * 2);
+        dgram = s->receiveDatagram(testData.size() * 2);
         QCOMPARE(dgram.data(), testData);
 
         //sockets bound to other interfaces shouldn't have received anything
@@ -1728,11 +1728,11 @@ void tst_QUdpSocket::linkLocalIPv4()
         QVERIFY(s->writeDatagram(testData, s->localAddress(), neutral.localPort()));
         QVERIFY2(neutral.waitForReadyRead(10000), QtNetworkSettings::msgSocketError(neutral).constData());
 
-        QNetworkDatagram dgram = neutral.receiveDatagram(testData.length() * 2);
+        QNetworkDatagram dgram = neutral.receiveDatagram(testData.size() * 2);
         QVERIFY(dgram.isValid());
         QCOMPARE(dgram.senderAddress(), s->localAddress());
         QCOMPARE(dgram.senderPort(), int(s->localPort()));
-        QCOMPARE(dgram.data().length(), testData.length());
+        QCOMPARE(dgram.data().size(), testData.size());
         QCOMPARE(dgram.data(), testData);
 
         // Unlike for IPv6 with IPV6_PKTINFO, IPv4 has no standardized way of
@@ -1751,7 +1751,7 @@ void tst_QUdpSocket::linkLocalIPv4()
 
         QVERIFY(neutral.writeDatagram(dgram.makeReply(testData)));
         QVERIFY2(s->waitForReadyRead(10000), QtNetworkSettings::msgSocketError(*s).constData());
-        dgram = s->receiveDatagram(testData.length() * 2);
+        dgram = s->receiveDatagram(testData.size() * 2);
         QVERIFY(dgram.isValid());
         QCOMPARE(dgram.data(), testData);