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>

16 files changed, 128 insertions, 128 deletions

diff --git a/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
index b1f3966285..6833eb5bc9 100644
--- a/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
+++ b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
@@ -666,7 +666,7 @@ void tst_QHttpNetworkConnection::getMultiple_data()
 static bool allRepliesFinished(const QList<QHttpNetworkReply*> *_replies)
 {
     const QList<QHttpNetworkReply*> &replies = *_replies;
-    for (int i = 0; i < replies.length(); i++)
+    for (int i = 0; i < replies.size(); i++)
         if (!replies.at(i)->isFinished())
             return false;
     return true;
@@ -735,7 +735,7 @@ void tst_QHttpNetworkConnection::getMultipleWithPipeliningAndMultiplePriorities(
     QTRY_VERIFY_WITH_TIMEOUT(allRepliesFinished(&replies), 60000);
 
     int pipelinedCount = 0;
-    for (int i = 0; i < replies.length(); i++) {
+    for (int i = 0; i < replies.size(); i++) {
         QVERIFY (!(replies.at(i)->request().isPipeliningAllowed() == false
             && replies.at(i)->isPipeliningUsed()));
 
diff --git a/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp b/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp
index d6709a614c..18fd0f01ab 100644
--- a/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp
+++ b/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp
@@ -553,11 +553,11 @@ void tst_QNetworkCookie::parseSingleCookie()
     QList<QNetworkCookie> result = QNetworkCookie::parseCookies(cookieString.toUtf8());
 
     //QEXPECT_FAIL("network2", "QDateTime parsing problem: the date is beyond year 8000", Abort);
-    QCOMPARE(result.count(), 1);
+    QCOMPARE(result.size(), 1);
     QCOMPARE(result.at(0), expectedCookie);
 
     result = QNetworkCookie::parseCookies(result.at(0).toRawForm());
-    QCOMPARE(result.count(), 1);
+    QCOMPARE(result.size(), 1);
 
     // Drop any millisecond information, if there's any
     QDateTime dt = expectedCookie.expirationDate();
diff --git a/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
index ddce612684..301bb633b8 100644
--- a/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
+++ b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
@@ -546,9 +546,9 @@ void tst_QNetworkCookieJar::rfc6265()
     QList<QNetworkCookie> cookiesToSend = jar.cookiesForUrl(sentUrl);
 
     //compare cookies only using name/value, as the metadata isn't sent over the network
-    QCOMPARE(cookiesToSend.count(), sent.count());
+    QCOMPARE(cookiesToSend.size(), sent.size());
     bool ok = true;
-    for (int i = 0; i < cookiesToSend.count(); i++) {
+    for (int i = 0; i < cookiesToSend.size(); i++) {
         if (cookiesToSend.at(i).name() != sent.at(i).name()) {
             ok = false;
             break;
diff --git a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
index fec66ebbd0..5f4a513a28 100644
--- a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
+++ b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
@@ -736,7 +736,7 @@ public:
                 if (d) {
                     QByteArray x = d->readAll();
                     if (x != longString && x != longString2) {
-                        qDebug() << x.length() << QString(x);
+                        qDebug() << x.size() << QString(x);
                         gotMetaData = cache.metaData(url);
                         qDebug() << (gotMetaData.url().toString())
                          << gotMetaData.lastModified()
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index e653ebf698..78a3bb51aa 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -733,7 +733,7 @@ public slots:
                     || receivedData.startsWith("CUSTOM_WITH_PAYLOAD");
             if (hasContent && contentLength == 0)
                 parseContentLength();
-            contentRead = receivedData.length() - endOfHeader;
+            contentRead = receivedData.size() - endOfHeader;
             if (hasContent && contentRead < contentLength)
                 return;
 
@@ -1995,7 +1995,7 @@ void tst_QNetworkReply::headFromHttp_data()
 
     QString httpServer = QtNetworkSettings::httpServerName();
     //testing proxies, mainly for the 407 response from http proxy
-    for (int i = 0; i < proxies.count(); ++i) {
+    for (int i = 0; i < proxies.size(); ++i) {
         QTest::newRow("rfc" + proxies.at(i).tag)
             << rfcsize
             << QUrl("http://" + httpServer + "/qtest/rfc3252.txt")
@@ -4813,7 +4813,7 @@ void tst_QNetworkReply::ioPostToHttpFromSocket_data()
     QTest::addColumn<int>("authenticationRequiredCount");
     QTest::addColumn<int>("proxyAuthenticationRequiredCount");
 
-    for (int i = 0; i < proxies.count(); ++i)
+    for (int i = 0; i < proxies.size(); ++i)
         for (int auth = 0; auth < 2; ++auth) {
             QUrl url;
             if (auth)
@@ -5990,7 +5990,7 @@ void tst_QNetworkReply::httpProxyCommands()
     // especially since it won't succeed in the HTTPS case
     // so just check that the command was correct
 
-    QString receivedHeader = proxyServer.receivedData.left(expectedCommand.length());
+    QString receivedHeader = proxyServer.receivedData.left(expectedCommand.size());
     QCOMPARE(receivedHeader, expectedCommand);
 
     //QTBUG-17223 - make sure the user agent from the request is sent to proxy server even for CONNECT
@@ -6074,7 +6074,7 @@ void tst_QNetworkReply::httpProxyCommandsSynchronous()
     // especially since it won't succeed in the HTTPS case
     // so just check that the command was correct
 
-    QString receivedHeader = proxyServer->receivedData.left(expectedCommand.length());
+    QString receivedHeader = proxyServer->receivedData.left(expectedCommand.size());
     QCOMPARE(receivedHeader, expectedCommand);
 }
 
@@ -7157,7 +7157,7 @@ void tst_QNetworkReply::authenticationCacheAfterCancel_data()
     QTest::addColumn<QNetworkProxy>("proxy");
     QTest::addColumn<bool>("proxyAuth");
     QTest::addColumn<QUrl>("url");
-    for (int i = 0; i < proxies.count(); ++i) {
+    for (int i = 0; i < proxies.size(); ++i) {
         QTest::newRow("http" + proxies.at(i).tag)
             << proxies.at(i).proxy
             << proxies.at(i).requiresAuthentication
@@ -8130,7 +8130,7 @@ void tst_QNetworkReply::dontInsertPartialContentIntoTheCache()
 
     QVERIFY(server.totalConnections > 0);
     QCOMPARE(reply->readAll().constData(), "load");
-    QCOMPARE(memoryCache->m_insertedUrls.count(), 0);
+    QCOMPARE(memoryCache->m_insertedUrls.size(), 0);
 }
 
 void tst_QNetworkReply::httpUserAgent()
@@ -8333,7 +8333,7 @@ void tst_QNetworkReply::emitErrorForAllReplies() // QTBUG-36890
     QList<QNetworkReply *> replies;
     QList<QSignalSpy *> errorSpies;
     QList<QSignalSpy *> finishedSpies;
-    for (int a = 0; a < urls.count(); ++a) {
+    for (int a = 0; a < urls.size(); ++a) {
         QNetworkRequest request(urls.at(a));
         QNetworkReply *reply = manager.get(request);
         replies.append(reply);
@@ -8345,7 +8345,7 @@ void tst_QNetworkReply::emitErrorForAllReplies() // QTBUG-36890
     }
     QTestEventLoop::instance().enterLoop(10);
     QVERIFY(!QTestEventLoop::instance().timeout());
-    for (int a = 0; a < urls.count(); ++a) {
+    for (int a = 0; a < urls.size(); ++a) {
         QVERIFY(replies.at(a)->isFinished());
         QCOMPARE(errorSpies.at(a)->count(), 1);
         errorSpies.at(a)->deleteLater();
@@ -8399,7 +8399,7 @@ public:
         return ret;
     }
     virtual bool atEnd() const override { return buffer.atEnd(); }
-    virtual qint64 size() const override { return data.length(); }
+    virtual qint64 size() const override { return data.size(); }
     qint64 bytesAvailable() const override
     {
         return buffer.bytesAvailable() + QIODevice::bytesAvailable();
@@ -8422,7 +8422,7 @@ void tst_QNetworkReply::putWithRateLimiting()
     QFile reference(testDataDir + "/rfc3252.txt");
     reference.open(QIODevice::ReadOnly);
     QByteArray data = reference.readAll();
-    QVERIFY(data.length() > 0);
+    QVERIFY(data.size() > 0);
 
     QUrl url = QUrl::fromUserInput("http://" + QtNetworkSettings::httpServerName()+ "/qtest/cgi-bin/echo.cgi?");
 
@@ -8437,7 +8437,7 @@ void tst_QNetworkReply::putWithRateLimiting()
     QCOMPARE(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(), 200);
 
     QByteArray uploadedData = reply->readAll();
-    QCOMPARE(uploadedData.length(), data.length());
+    QCOMPARE(uploadedData.size(), data.size());
     QCOMPARE(uploadedData, data);
 }
 
@@ -8807,7 +8807,7 @@ void tst_QNetworkReply::ioHttpCookiesDuringRedirect()
     const QString cookieHeader = QStringLiteral("Set-Cookie: hello=world; Path=/;\r\n");
     QString redirect = tempRedirectReplyStr();
     // Insert 'cookieHeader' before the final \r\n
-    redirect.insert(redirect.length() - 2, cookieHeader);
+    redirect.insert(redirect.size() - 2, cookieHeader);
 
     QUrl url("http://localhost/");
     url.setPort(target.serverPort());
@@ -9234,7 +9234,7 @@ public slots:
             //qDebug() << m_receivedData.left(m_receivedData.indexOf("\r\n\r\n"));
             m_receivedData = m_receivedData.mid(m_receivedData.indexOf("\r\n\r\n")+4); // check only actual data
         }
-        if (m_receivedData.length() > 0 && !m_expectedData.startsWith(m_receivedData)) {
+        if (m_receivedData.size() > 0 && !m_expectedData.startsWith(m_receivedData)) {
             // We had received some data but it is corrupt!
             qDebug() << "CORRUPT" << m_receivedData.size();
 
diff --git a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
index f5d1c1cb5e..3564e52917 100644
--- a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
+++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
@@ -227,7 +227,7 @@ void tst_QHostInfo::lookupIPv4()
     QCOMPARE((int)lookupResults.error(), (int)err);
 
     QStringList tmp;
-    for (int i = 0; i < lookupResults.addresses().count(); ++i)
+    for (int i = 0; i < lookupResults.addresses().size(); ++i)
         tmp.append(lookupResults.addresses().at(i).toString());
     tmp.sort();
 
@@ -272,7 +272,7 @@ void tst_QHostInfo::lookupIPv6()
     QCOMPARE((int)lookupResults.error(), (int)err);
 
     QStringList tmp;
-    for (int i = 0; i < lookupResults.addresses().count(); ++i)
+    for (int i = 0; i < lookupResults.addresses().size(); ++i)
         tmp.append(lookupResults.addresses().at(i).toString());
     tmp.sort();
 
@@ -351,7 +351,7 @@ void tst_QHostInfo::lookupConnectToLambda()
     QCOMPARE(int(lookupResults.error()), int(err));
 
     QStringList tmp;
-    for (int i = 0; i < lookupResults.addresses().count(); ++i)
+    for (int i = 0; i < lookupResults.addresses().size(); ++i)
         tmp.append(lookupResults.addresses().at(i).toString());
     tmp.sort();
 
@@ -405,12 +405,12 @@ static QStringList reverseLookupHelper(const QString &ip)
     for (QByteArray line : lines) {
         int index = -1;
         if ((index = line.indexOf(nameMarkerNix)) != -1) { // Linux and macOS
-            name = line.mid(index + nameMarkerNix.length()).chopped(1).trimmed();
+            name = line.mid(index + nameMarkerNix.size()).chopped(1).trimmed();
             results << name;
         } else if (line.startsWith(nameMarkerWin)) { // Windows formatting
             name = line.mid(line.lastIndexOf(" ")).trimmed();
         } else if (line.startsWith(addressMarkerWin)) {
-            QByteArray address = line.mid(addressMarkerWin.length()).trimmed();
+            QByteArray address = line.mid(addressMarkerWin.size()).trimmed();
             if (address == ip.toUtf8()) {
                 results << name;
             }
@@ -477,7 +477,7 @@ void tst_QHostInfo::blockingLookup()
 
     QHostInfo hostInfo = QHostInfo::fromName(hostname);
     QStringList tmp;
-    for (int i = 0; i < hostInfo.addresses().count(); ++i)
+    for (int i = 0; i < hostInfo.addresses().size(); ++i)
         tmp.append(hostInfo.addresses().at(i).toString());
     tmp.sort();
 
@@ -507,7 +507,7 @@ protected:
     {
          QHostInfo info = QHostInfo::fromName("a-single" TEST_DOMAIN);
          QCOMPARE(info.error(), QHostInfo::NoError);
-         QVERIFY(info.addresses().count() > 0);
+         QVERIFY(info.addresses().size() > 0);
          QCOMPARE(info.addresses().at(0).toString(), QString("192.0.2.1"));
     }
 };
@@ -566,7 +566,7 @@ void tst_QHostInfo::threadSafetyAsynchronousAPI()
         thread->start();
         threads.append(thread);
     }
-    for (int k = threads.count() - 1; k >= 0; --k)
+    for (int k = threads.size() - 1; k >= 0; --k)
         QVERIFY(threads.at(k)->wait(60000));
     foreach (LookupReceiver* receiver, receivers) {
         QCOMPARE(receiver->result.error(), QHostInfo::NoError);
diff --git a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
index d609bf5877..36027d89da 100644
--- a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
+++ b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
@@ -251,7 +251,7 @@ void tst_QNetworkInterface::interfaceFromXXX_data()
     QTest::addColumn<QNetworkInterface>("iface");
 
     QList<QNetworkInterface> allInterfaces = QNetworkInterface::allInterfaces();
-    if (allInterfaces.count() == 0)
+    if (allInterfaces.size() == 0)
         QSKIP("No interfaces to test!");
     foreach (QNetworkInterface iface, allInterfaces)
         QTest::newRow(iface.name().toLocal8Bit()) << iface;
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);
 
diff --git a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
index d4a1f510a9..9e2b8b272d 100644
--- a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
+++ b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
@@ -493,7 +493,7 @@ void tst_QSslCertificate::utf8SubjectNames()
     static const char *ou = "\xe3\x88\xa7" "A" "\xe3\x89\x81\xef\xbd\xab" "BC";
 
     // the following two tests should help find "\x"-literal encoding bugs in the test itself
-    QCOMPARE(cert.subjectInfo("O")[0].length(), QString::fromUtf8(o).length());
+    QCOMPARE(cert.subjectInfo("O")[0].size(), QString::fromUtf8(o).size());
     QCOMPARE (cert.subjectInfo("O")[0].toUtf8().toHex(), QByteArray(o).toHex());
 
     QCOMPARE(cert.subjectInfo("O")[0], QString::fromUtf8(o));
@@ -941,8 +941,8 @@ void tst_QSslCertificate::largeExpirationDate() // QTBUG-12489
 void tst_QSslCertificate::blacklistedCertificates()
 {
     QList<QSslCertificate> blacklistedCerts = QSslCertificate::fromPath(testDataDir + "more-certificates/blacklisted*.pem", QSsl::Pem, QSslCertificate::PatternSyntax::Wildcard);
-    QVERIFY(blacklistedCerts.count() > 0);
-    for (int a = 0; a < blacklistedCerts.count(); a++) {
+    QVERIFY(blacklistedCerts.size() > 0);
+    for (int a = 0; a < blacklistedCerts.size(); a++) {
         QVERIFY(blacklistedCerts.at(a).isBlacklisted());
     }
 }
@@ -984,7 +984,7 @@ void tst_QSslCertificate::multipleCommonNames()
 {
     QList<QSslCertificate> certList =
         QSslCertificate::fromPath(testDataDir + "more-certificates/test-cn-two-cns-cert.pem", QSsl::Pem, QSslCertificate::PatternSyntax::FixedString);
-    QVERIFY(certList.count() > 0);
+    QVERIFY(certList.size() > 0);
 
     QStringList commonNames = certList[0].subjectInfo(QSslCertificate::CommonName);
     QVERIFY(commonNames.contains(QString("www.example.com")));
@@ -995,14 +995,14 @@ void tst_QSslCertificate::subjectAndIssuerAttributes()
 {
     QList<QSslCertificate> certList =
         QSslCertificate::fromPath(testDataDir + "more-certificates/test-cn-with-drink-cert.pem", QSsl::Pem, QSslCertificate::PatternSyntax::FixedString);
-    QVERIFY(certList.count() > 0);
+    QVERIFY(certList.size() > 0);
 
     QList<QByteArray> attributes = certList[0].subjectInfoAttributes();
     QVERIFY(attributes.contains(QByteArray("favouriteDrink")));
     attributes.clear();
 
     certList = QSslCertificate::fromPath(testDataDir + "more-certificates/natwest-banking.pem", QSsl::Pem, QSslCertificate::PatternSyntax::FixedString);
-    QVERIFY(certList.count() > 0);
+    QVERIFY(certList.size() > 0);
 
     QByteArray shortName("1.3.6.1.4.1.311.60.2.1.3");
 #if !defined(QT_NO_OPENSSL) && defined(SN_jurisdictionCountryName)
@@ -1029,7 +1029,7 @@ void tst_QSslCertificate::verify()
 
     // Empty chain is unspecified error
     errors = QSslCertificate::verify(toVerify);
-    VERIFY_VERBOSE(errors.count() == 1);
+    VERIFY_VERBOSE(errors.size() == 1);
     VERIFY_VERBOSE(errors[0] == QSslError(QSslError::UnspecifiedError));
     errors.clear();
 
@@ -1048,7 +1048,7 @@ void tst_QSslCertificate::verify()
     toVerify = QSslCertificate::fromPath(testDataDir + "verify-certs/test-ocsp-good-cert.pem", QSsl::Pem, QSslCertificate::PatternSyntax::FixedString);
 
     errors = QSslCertificate::verify(toVerify);
-    VERIFY_VERBOSE(errors.count() == 0);
+    VERIFY_VERBOSE(errors.size() == 0);
     errors.clear();
 
     // Test a blacklisted certificate
@@ -1083,11 +1083,11 @@ void tst_QSslCertificate::verify()
     toVerify << QSslCertificate::fromPath(testDataDir + "verify-certs/test-intermediate-is-ca-cert.pem", QSsl::Pem, QSslCertificate::PatternSyntax::FixedString).first();
     toVerify << QSslCertificate::fromPath(testDataDir + "verify-certs/test-intermediate-ca-cert.pem", QSsl::Pem, QSslCertificate::PatternSyntax::FixedString).first();
     errors = QSslCertificate::verify(toVerify);
-    VERIFY_VERBOSE(errors.count() == 0);
+    VERIFY_VERBOSE(errors.size() == 0);
 
     // Recheck the above with hostname validation
     errors = QSslCertificate::verify(toVerify, QLatin1String("example.com"));
-    VERIFY_VERBOSE(errors.count() == 0);
+    VERIFY_VERBOSE(errors.size() == 0);
 
     // Recheck the above with a bad hostname
     errors = QSslCertificate::verify(toVerify, QLatin1String("fail.example.com"));
@@ -1112,11 +1112,11 @@ void tst_QSslCertificate::extensions()
 {
     QList<QSslCertificate> certList =
         QSslCertificate::fromPath(testDataDir + "more-certificates/natwest-banking.pem", QSsl::Pem, QSslCertificate::PatternSyntax::FixedString);
-    QVERIFY(certList.count() > 0);
+    QVERIFY(certList.size() > 0);
 
     QSslCertificate cert = certList[0];
     QList<QSslCertificateExtension> extensions = cert.extensions();
-    QCOMPARE(extensions.count(), 9);
+    QCOMPARE(extensions.size(), 9);
 
     int unknown_idx = -1;
     int authority_info_idx = -1;
@@ -1124,7 +1124,7 @@ void tst_QSslCertificate::extensions()
     int subject_key_idx = -1;
     int auth_key_idx = -1;
 
-    for (int i=0; i < extensions.length(); ++i) {
+    for (int i=0; i < extensions.size(); ++i) {
         QSslCertificateExtension ext = extensions[i];
 
         //qDebug() << i << ":" << ext.name() << ext.oid();
@@ -1210,16 +1210,16 @@ void tst_QSslCertificate::extensionsCritical()
 {
     QList<QSslCertificate> certList =
         QSslCertificate::fromPath(testDataDir + "verify-certs/test-addons-mozilla-org-cert.pem", QSsl::Pem, QSslCertificate::PatternSyntax::FixedString);
-    QVERIFY(certList.count() > 0);
+    QVERIFY(certList.size() > 0);
 
     QSslCertificate cert = certList[0];
     QList<QSslCertificateExtension> extensions = cert.extensions();
-    QCOMPARE(extensions.count(), 9);
+    QCOMPARE(extensions.size(), 9);
 
     int basic_constraints_idx = -1;
     int key_usage_idx = -1;
 
-    for (int i=0; i < extensions.length(); ++i) {
+    for (int i=0; i < extensions.size(); ++i) {
         QSslCertificateExtension ext = extensions[i];
 
         if (ext.name() == QStringLiteral("basicConstraints"))
diff --git a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
index 627b6cca98..12f29bf107 100644
--- a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
+++ b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
@@ -315,7 +315,7 @@ void tst_QSslKey::constructorHandle()
         passphrase = "1234";
 
     BIO* bio = q_BIO_new(q_BIO_s_mem());
-    q_BIO_write(bio, pem.constData(), pem.length());
+    q_BIO_write(bio, pem.constData(), pem.size());
     EVP_PKEY *origin = func(bio, nullptr, nullptr, static_cast<void *>(passphrase.data()));
     Q_ASSERT(origin);
     q_EVP_PKEY_up_ref(origin);
diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
index 3b0f315060..fcfc247db9 100644
--- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -1019,7 +1019,7 @@ void tst_QSslSocket::ciphers()
     QString ciphersAsString;
     const auto &supported = sslConfig.supportedCiphers();
     for (const auto &cipher : supported) {
-        if (cipher.isNull() || !cipher.name().length())
+        if (cipher.isNull() || !cipher.name().size())
             continue;
         if (ciphers.size() > 0)
             ciphersAsString += QStringLiteral(":");
@@ -1233,7 +1233,7 @@ void tst_QSslSocket::peerCertificateChain()
     QSslSocketPtr socket = newSocket();
     this->socket = socket.data();
     QList<QSslCertificate> caCertificates = QSslCertificate::fromPath(httpServerCertChainPath());
-    QCOMPARE(caCertificates.count(), 1);
+    QCOMPARE(caCertificates.size(), 1);
     auto config = socket->sslConfiguration();
     config.addCaCertificates(caCertificates);
     socket->setSslConfiguration(config);
@@ -1250,7 +1250,7 @@ void tst_QSslSocket::peerCertificateChain()
         QSKIP("Skipping flaky test - See QTBUG-29941");
 
     QList<QSslCertificate> certChain = socket->peerCertificateChain();
-    QVERIFY(certChain.count() > 0);
+    QVERIFY(certChain.size() > 0);
     QCOMPARE(certChain.first(), socket->peerCertificate());
 
     socket->disconnectFromHost();
@@ -3076,7 +3076,7 @@ void tst_QSslSocket::blacklistedCertificates()
     connect(receiver, SIGNAL(encrypted()), SLOT(exitLoop()));
     enterLoop(1);
     QList<QSslError> sslErrors = receiver->sslHandshakeErrors();
-    QVERIFY(sslErrors.count() > 0);
+    QVERIFY(sslErrors.size() > 0);
     // there are more errors (self signed cert and hostname mismatch), but we only care about the blacklist error
     QCOMPARE(sslErrors.at(0).error(), QSslError::CertificateBlacklisted);
 }
@@ -3369,17 +3369,17 @@ void tst_QSslSocket::qtbug18498_peek2()
     bigblock.fill('#', QIODEVICE_BUFFERSIZE + 1024);
     QVERIFY(client->write(QByteArray("head")));
     QVERIFY(client->write(bigblock));
-    QTRY_COMPARE(server->bytesAvailable(), bigblock.length() + 4);
+    QTRY_COMPARE(server->bytesAvailable(), bigblock.size() + 4);
     QCOMPARE(server->read(4), QByteArray("head"));
-    QCOMPARE(server->peek(bigblock.length()), bigblock);
-    b.reserve(bigblock.length());
-    b.resize(server->peek(b.data(), bigblock.length()));
+    QCOMPARE(server->peek(bigblock.size()), bigblock);
+    b.reserve(bigblock.size());
+    b.resize(server->peek(b.data(), bigblock.size()));
     QCOMPARE(b, bigblock);
 
     //check oversized peek
-    QCOMPARE(server->peek(bigblock.length() * 3), bigblock);
-    b.reserve(bigblock.length() * 3);
-    b.resize(server->peek(b.data(), bigblock.length() * 3));
+    QCOMPARE(server->peek(bigblock.size() * 3), bigblock);
+    b.reserve(bigblock.size() * 3);
+    b.resize(server->peek(b.data(), bigblock.size() * 3));
     QCOMPARE(b, bigblock);
 
     QCOMPARE(server->readAll(), bigblock);
@@ -3715,7 +3715,7 @@ void tst_QSslSocket::verifyClientCertificate()
     } else {
         QCOMPARE(server.socket->peerCertificate(), clientCerts.first());
         if (isTestingSchannel) {
-            if (clientCerts.count() == 1 && server.socket->peerCertificateChain().count() == 2) {
+            if (clientCerts.size() == 1 && server.socket->peerCertificateChain().size() == 2) {
                 QEXPECT_FAIL("",
                              "Schannel includes the entire chain, not just the leaf and intermediates",
                              Continue);
@@ -4075,14 +4075,14 @@ void tst_QSslSocket::simplePskConnect()
 
     case PskConnectWrongCredentials:
         // provide totally wrong credentials
-        provider.setIdentity(PSK_CLIENT_IDENTITY.left(PSK_CLIENT_IDENTITY.length() - 1));
-        provider.setPreSharedKey(PSK_CLIENT_PRESHAREDKEY.left(PSK_CLIENT_PRESHAREDKEY.length() - 1));
+        provider.setIdentity(PSK_CLIENT_IDENTITY.left(PSK_CLIENT_IDENTITY.size() - 1));
+        provider.setPreSharedKey(PSK_CLIENT_PRESHAREDKEY.left(PSK_CLIENT_PRESHAREDKEY.size() - 1));
         connect(&socket, SIGNAL(preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator*)), &provider, SLOT(providePsk(QSslPreSharedKeyAuthenticator*)));
         break;
 
     case PskConnectWrongIdentity:
         // right PSK, wrong identity
-        provider.setIdentity(PSK_CLIENT_IDENTITY.left(PSK_CLIENT_IDENTITY.length() - 1));
+        provider.setIdentity(PSK_CLIENT_IDENTITY.left(PSK_CLIENT_IDENTITY.size() - 1));
         provider.setPreSharedKey(PSK_CLIENT_PRESHAREDKEY);
         connect(&socket, SIGNAL(preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator*)), &provider, SLOT(providePsk(QSslPreSharedKeyAuthenticator*)));
         break;
@@ -4090,7 +4090,7 @@ void tst_QSslSocket::simplePskConnect()
     case PskConnectWrongPreSharedKey:
         // right identity, wrong PSK
         provider.setIdentity(PSK_CLIENT_IDENTITY);
-        provider.setPreSharedKey(PSK_CLIENT_PRESHAREDKEY.left(PSK_CLIENT_PRESHAREDKEY.length() - 1));
+        provider.setPreSharedKey(PSK_CLIENT_PRESHAREDKEY.left(PSK_CLIENT_PRESHAREDKEY.size() - 1));
         connect(&socket, SIGNAL(preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator*)), &provider, SLOT(providePsk(QSslPreSharedKeyAuthenticator*)));
         break;
 
diff --git a/tests/auto/network/ssl/shared/qopenssl_symbols.h b/tests/auto/network/ssl/shared/qopenssl_symbols.h
index 13cacc5317..dff5bc8163 100644
--- a/tests/auto/network/ssl/shared/qopenssl_symbols.h
+++ b/tests/auto/network/ssl/shared/qopenssl_symbols.h
@@ -405,7 +405,7 @@ struct LibGreaterThan
     {
         const auto lhsparts = lhs.split(QLatin1Char('.'));
         const auto rhsparts = rhs.split(QLatin1Char('.'));
-        Q_ASSERT(lhsparts.count() > 1 && rhsparts.count() > 1);
+        Q_ASSERT(lhsparts.size() > 1 && rhsparts.size() > 1);
 
         // note: checking rhs < lhs, the same as lhs > rhs
         return std::lexicographical_compare(rhsparts.begin() + 1, rhsparts.end(),