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

This is a semantic patch using ClangTidyTransformator as in
qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8, but extended to
handle typedefs and accesses through pointers, too:

    const std::string o = "object";

    auto hasTypeIgnoringPointer = [](auto type) { return anyOf(hasType(type), hasType(pointsTo(type))); };

    auto derivedFromAnyOfClasses = [&](ArrayRef<StringRef> classes) {
        auto exprOfDeclaredType = [&](auto decl) {
            return expr(hasTypeIgnoringPointer(hasUnqualifiedDesugaredType(recordType(hasDeclaration(decl))))).bind(o);
        };
        return exprOfDeclaredType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))));
    };

    auto renameMethod = [&] (ArrayRef<StringRef> classes,
                            StringRef from, StringRef to) {
        return makeRule(cxxMemberCallExpr(on(derivedFromAnyOfClasses(classes)),
                            callee(cxxMethodDecl(hasName(from), parameterCountIs(0)))),
                        changeTo(cat(access(o, cat(to)), "()")),
                        cat("use '", to, "' instead of '", from, "'"));
    };

    renameMethod(<classes>, "count", "size");
    renameMethod(<classes>, "length", "size");

except that the on() matcher has been replaced by one that doesn't
ignoreParens().

a.k.a qt-port-to-std-compatible-api V5 with config Scope: 'Container'.

Added two NOLINTNEXTLINEs in tst_qbitarray and tst_qcontiguouscache,
to avoid porting calls that explicitly test count().

Change-Id: Icfb8808c2ff4a30187e9935a51cad26987451c22
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

1 files changed, 69 insertions, 69 deletions

diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
index 5d8de03d7f..4e380bcde1 100644
--- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -836,30 +836,30 @@ void tst_QSslSocket::simpleConnect()
 
     // Entered connecting state
     QCOMPARE(socket.state(), QAbstractSocket::ConnectingState);
-    QCOMPARE(connectedSpy.count(), 0);
-    QCOMPARE(hostFoundSpy.count(), 1);
-    QCOMPARE(disconnectedSpy.count(), 0);
+    QCOMPARE(connectedSpy.size(), 0);
+    QCOMPARE(hostFoundSpy.size(), 1);
+    QCOMPARE(disconnectedSpy.size(), 0);
     enterLoop(10);
 
     // Entered connected state
     QCOMPARE(socket.state(), QAbstractSocket::ConnectedState);
     QCOMPARE(socket.mode(), QSslSocket::UnencryptedMode);
     QVERIFY(!socket.isEncrypted());
-    QCOMPARE(connectedSpy.count(), 1);
-    QCOMPARE(hostFoundSpy.count(), 1);
-    QCOMPARE(disconnectedSpy.count(), 0);
+    QCOMPARE(connectedSpy.size(), 1);
+    QCOMPARE(hostFoundSpy.size(), 1);
+    QCOMPARE(disconnectedSpy.size(), 0);
 
     // Enter encrypted mode
     socket.startClientEncryption();
     QCOMPARE(socket.mode(), QSslSocket::SslClientMode);
     QVERIFY(!socket.isEncrypted());
-    QCOMPARE(connectionEncryptedSpy.count(), 0);
-    QCOMPARE(sslErrorsSpy.count(), 0);
+    QCOMPARE(connectionEncryptedSpy.size(), 0);
+    QCOMPARE(sslErrorsSpy.size(), 0);
 
     // Starting handshake
     enterLoop(10);
-    QCOMPARE(sslErrorsSpy.count(), 1);
-    QCOMPARE(connectionEncryptedSpy.count(), 0);
+    QCOMPARE(sslErrorsSpy.size(), 1);
+    QCOMPARE(connectionEncryptedSpy.size(), 0);
     QVERIFY(!socket.isEncrypted());
     QCOMPARE(socket.state(), QAbstractSocket::UnconnectedState);
 }
@@ -897,10 +897,10 @@ void tst_QSslSocket::simpleConnectWithIgnore()
     enterLoop(10);
 
     // Done; encryption should be enabled.
-    QCOMPARE(sslErrorsSpy.count(), 1);
+    QCOMPARE(sslErrorsSpy.size(), 1);
     QVERIFY(socket.isEncrypted());
     QCOMPARE(socket.state(), QAbstractSocket::ConnectedState);
-    QCOMPARE(encryptedSpy.count(), 1);
+    QCOMPARE(encryptedSpy.size(), 1);
 
     // Wait for incoming data
     if (!socket.canReadLine())
@@ -2821,7 +2821,7 @@ void tst_QSslSocket::closeWhileEmittingSocketError()
     QTestEventLoop::instance().enterLoopMSecs(1000);
     QVERIFY(!QTestEventLoop::instance().timeout());
 
-    QCOMPARE(socketErrorSpy.count(), 1);
+    QCOMPARE(socketErrorSpy.size(), 1);
 }
 
 #endif // Feature 'openssl'.
@@ -2918,7 +2918,7 @@ void tst_QSslSocket::ignoreSslErrorsList()
     bool expectEncryptionSuccess = (expectedSslErrorSignalCount == 0);
     if (socket.waitForEncrypted(10000) != expectEncryptionSuccess)
         QSKIP("Skipping flaky test - See QTBUG-29941");
-    QCOMPARE(sslErrorsSpy.count(), expectedSslErrorSignalCount);
+    QCOMPARE(sslErrorsSpy.size(), expectedSslErrorSignalCount);
 }
 
 void tst_QSslSocket::ignoreSslErrorsListWithSlot_data()
@@ -3160,9 +3160,9 @@ void tst_QSslSocket::resume()
     QFETCH_GLOBAL(bool, setProxy);
     if (setProxy && QTestEventLoop::instance().timeout())
         QSKIP("Skipping flaky test - See QTBUG-29941");
-    QCOMPARE(sslErrorSpy.count(), 1);
-    QCOMPARE(errorSpy.count(), 0);
-    QCOMPARE(encryptedSpy.count(), 0);
+    QCOMPARE(sslErrorSpy.size(), 1);
+    QCOMPARE(errorSpy.size(), 0);
+    QCOMPARE(encryptedSpy.size(), 0);
     QVERIFY(!socket.isEncrypted());
     if (ignoreErrorsAfterPause) {
         if (errorsToIgnore.empty())
@@ -3174,15 +3174,15 @@ void tst_QSslSocket::resume()
     QTestEventLoop::instance().enterLoop(10);
     QVERIFY(!QTestEventLoop::instance().timeout()); // quit by encrypted() or error() signal
     if (expectSuccess) {
-        QCOMPARE(encryptedSpy.count(), 1);
+        QCOMPARE(encryptedSpy.size(), 1);
         QVERIFY(socket.isEncrypted());
-        QCOMPARE(errorSpy.count(), 0);
+        QCOMPARE(errorSpy.size(), 0);
         socket.disconnectFromHost();
         QVERIFY(socket.waitForDisconnected(10000));
     } else {
-        QCOMPARE(encryptedSpy.count(), 0);
+        QCOMPARE(encryptedSpy.size(), 0);
         QVERIFY(!socket.isEncrypted());
-        QCOMPARE(errorSpy.count(), 1);
+        QCOMPARE(errorSpy.size(), 1);
         QCOMPARE(socket.error(), QAbstractSocket::SslHandshakeFailedError);
     }
 }
@@ -4142,32 +4142,32 @@ void tst_QSslSocket::simplePskConnect()
 
     // Entered connecting state
     QCOMPARE(socket.state(), QAbstractSocket::ConnectingState);
-    QCOMPARE(connectedSpy.count(), 0);
-    QCOMPARE(hostFoundSpy.count(), 1);
-    QCOMPARE(disconnectedSpy.count(), 0);
+    QCOMPARE(connectedSpy.size(), 0);
+    QCOMPARE(hostFoundSpy.size(), 1);
+    QCOMPARE(disconnectedSpy.size(), 0);
     enterLoop(10);
 
     // Entered connected state
     QCOMPARE(socket.state(), QAbstractSocket::ConnectedState);
     QCOMPARE(socket.mode(), QSslSocket::UnencryptedMode);
     QVERIFY(!socket.isEncrypted());
-    QCOMPARE(connectedSpy.count(), 1);
-    QCOMPARE(hostFoundSpy.count(), 1);
-    QCOMPARE(disconnectedSpy.count(), 0);
+    QCOMPARE(connectedSpy.size(), 1);
+    QCOMPARE(hostFoundSpy.size(), 1);
+    QCOMPARE(disconnectedSpy.size(), 0);
 
     // Enter encrypted mode
     socket.startClientEncryption();
     QCOMPARE(socket.mode(), QSslSocket::SslClientMode);
     QVERIFY(!socket.isEncrypted());
-    QCOMPARE(connectionEncryptedSpy.count(), 0);
-    QCOMPARE(sslErrorsSpy.count(), 0);
-    QCOMPARE(peerVerifyErrorSpy.count(), 0);
+    QCOMPARE(connectionEncryptedSpy.size(), 0);
+    QCOMPARE(sslErrorsSpy.size(), 0);
+    QCOMPARE(peerVerifyErrorSpy.size(), 0);
 
     // Start handshake.
     enterLoop(10);
 
     // We must get the PSK signal in all cases
-    QCOMPARE(pskAuthenticationRequiredSpy.count(), 1);
+    QCOMPARE(pskAuthenticationRequiredSpy.size(), 1);
 
     switch (pskTestType) {
     case PskConnectDoNotHandlePsk:
@@ -4176,40 +4176,40 @@ void tst_QSslSocket::simplePskConnect()
     case PskConnectWrongIdentity:
     case PskConnectWrongPreSharedKey:
         // Handshake failure
-        QCOMPARE(socketErrorsSpy.count(), 1);
+        QCOMPARE(socketErrorsSpy.size(), 1);
         QCOMPARE(qvariant_cast<QAbstractSocket::SocketError>(socketErrorsSpy.at(0).at(0)), QAbstractSocket::SslHandshakeFailedError);
-        QCOMPARE(sslErrorsSpy.count(), 0);
-        QCOMPARE(peerVerifyErrorSpy.count(), 0);
-        QCOMPARE(connectionEncryptedSpy.count(), 0);
+        QCOMPARE(sslErrorsSpy.size(), 0);
+        QCOMPARE(peerVerifyErrorSpy.size(), 0);
+        QCOMPARE(connectionEncryptedSpy.size(), 0);
         QVERIFY(!socket.isEncrypted());
         break;
 
     case PskConnectRightCredentialsPeerVerifyFailure:
         // Peer verification failure
-        QCOMPARE(socketErrorsSpy.count(), 1);
+        QCOMPARE(socketErrorsSpy.size(), 1);
         QCOMPARE(qvariant_cast<QAbstractSocket::SocketError>(socketErrorsSpy.at(0).at(0)), QAbstractSocket::SslHandshakeFailedError);
-        QCOMPARE(sslErrorsSpy.count(), 1);
-        QCOMPARE(peerVerifyErrorSpy.count(), 1);
-        QCOMPARE(connectionEncryptedSpy.count(), 0);
+        QCOMPARE(sslErrorsSpy.size(), 1);
+        QCOMPARE(peerVerifyErrorSpy.size(), 1);
+        QCOMPARE(connectionEncryptedSpy.size(), 0);
         QVERIFY(!socket.isEncrypted());
         break;
 
     case PskConnectRightCredentialsVerifyPeer:
         // Peer verification failure, but ignore it and keep connecting
-        QCOMPARE(socketErrorsSpy.count(), 0);
-        QCOMPARE(sslErrorsSpy.count(), 1);
-        QCOMPARE(peerVerifyErrorSpy.count(), 1);
-        QCOMPARE(connectionEncryptedSpy.count(), 1);
+        QCOMPARE(socketErrorsSpy.size(), 0);
+        QCOMPARE(sslErrorsSpy.size(), 1);
+        QCOMPARE(peerVerifyErrorSpy.size(), 1);
+        QCOMPARE(connectionEncryptedSpy.size(), 1);
         QVERIFY(socket.isEncrypted());
         QCOMPARE(socket.state(), QAbstractSocket::ConnectedState);
         break;
 
     case PskConnectRightCredentialsDoNotVerifyPeer:
         // No peer verification => no failure
-        QCOMPARE(socketErrorsSpy.count(), 0);
-        QCOMPARE(sslErrorsSpy.count(), 0);
-        QCOMPARE(peerVerifyErrorSpy.count(), 0);
-        QCOMPARE(connectionEncryptedSpy.count(), 1);
+        QCOMPARE(socketErrorsSpy.size(), 0);
+        QCOMPARE(sslErrorsSpy.size(), 0);
+        QCOMPARE(peerVerifyErrorSpy.size(), 0);
+        QCOMPARE(connectionEncryptedSpy.size(), 1);
         QVERIFY(socket.isEncrypted());
         QCOMPARE(socket.state(), QAbstractSocket::ConnectedState);
         break;
@@ -4250,7 +4250,7 @@ void tst_QSslSocket::simplePskConnect()
     }
 
     QCOMPARE(socket.state(), QAbstractSocket::UnconnectedState);
-    QCOMPARE(disconnectedSpy.count(), 1);
+    QCOMPARE(disconnectedSpy.size(), 1);
 }
 
 void tst_QSslSocket::ephemeralServerKey_data()
@@ -4283,7 +4283,7 @@ void tst_QSslSocket::ephemeralServerKey()
     client->connectToHostEncrypted(QHostAddress(QHostAddress::LocalHost).toString(), server.serverPort());
     spy.wait();
 
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QVERIFY(server.config.ephemeralServerKey().isNull());
     QCOMPARE(client->sslConfiguration().ephemeralServerKey().isNull(), emptyKey);
 }
@@ -4346,22 +4346,22 @@ void tst_QSslSocket::pskServer()
     QCOMPARE(socket.state(), QAbstractSocket::ConnectedState);
     QCOMPARE(socket.mode(), QSslSocket::UnencryptedMode);
     QVERIFY(!socket.isEncrypted());
-    QCOMPARE(connectedSpy.count(), 1);
-    QCOMPARE(disconnectedSpy.count(), 0);
+    QCOMPARE(connectedSpy.size(), 1);
+    QCOMPARE(disconnectedSpy.size(), 0);
 
     // Enter encrypted mode
     socket.startClientEncryption();
     QCOMPARE(socket.mode(), QSslSocket::SslClientMode);
     QVERIFY(!socket.isEncrypted());
-    QCOMPARE(connectionEncryptedSpy.count(), 0);
+    QCOMPARE(connectionEncryptedSpy.size(), 0);
 
     // Start handshake.
     enterLoop(10);
 
     // We must get the PSK signal in all cases
-    QCOMPARE(pskAuthenticationRequiredSpy.count(), 1);
+    QCOMPARE(pskAuthenticationRequiredSpy.size(), 1);
 
-    QCOMPARE(connectionEncryptedSpy.count(), 1);
+    QCOMPARE(connectionEncryptedSpy.size(), 1);
     QVERIFY(socket.isEncrypted());
     QCOMPARE(socket.state(), QAbstractSocket::ConnectedState);
 
@@ -4374,7 +4374,7 @@ void tst_QSslSocket::pskServer()
     enterLoop(10);
 
     QCOMPARE(socket.state(), QAbstractSocket::UnconnectedState);
-    QCOMPARE(disconnectedSpy.count(), 1);
+    QCOMPARE(disconnectedSpy.size(), 1);
 }
 
 void tst_QSslSocket::signatureAlgorithm_data()
@@ -4527,7 +4527,7 @@ void tst_QSslSocket::forwardReadChannelFinished()
             &QTestEventLoop::instance(), &QTestEventLoop::exitLoop);
     socket.connectToHostEncrypted(QtNetworkSettings::httpServerName(), 443);
     enterLoop(10);
-    QVERIFY(readChannelFinishedSpy.count());
+    QVERIFY(readChannelFinishedSpy.size());
 }
 
 #endif // QT_CONFIG(openssl)
@@ -4714,8 +4714,8 @@ void tst_QSslSocket::alertMissingCertificate()
         runner.enterLoopMSecs(10000);
     }
 
-    QVERIFY(serverSpy.count() > 0);
-    QVERIFY(clientSpy.count() > 0);
+    QVERIFY(serverSpy.size() > 0);
+    QVERIFY(clientSpy.size() > 0);
     QVERIFY(server.socket && !server.socket->isEncrypted());
     QVERIFY(!clientSocket.isEncrypted());
 }
@@ -4768,9 +4768,9 @@ void tst_QSslSocket::alertInvalidCertificate()
 
     runner.enterLoopMSecs(1000);
 
-    QVERIFY(serverSpy.count() > 0);
-    QVERIFY(clientSpy.count() > 0);
-    QVERIFY(interruptedSpy.count() > 0);
+    QVERIFY(serverSpy.size() > 0);
+    QVERIFY(clientSpy.size() > 0);
+    QVERIFY(interruptedSpy.size() > 0);
     QVERIFY(server.socket && !server.socket->isEncrypted());
     QVERIFY(!clientSocket.isEncrypted());
 }
@@ -4897,14 +4897,14 @@ void tst_QSslSocket::selfSignedCertificates()
     runner.enterLoopMSecs(1000);
 
     if (clientKnown) {
-        QCOMPARE(serverSpy.count(), 0);
-        QCOMPARE(clientSpy.count(), 0);
+        QCOMPARE(serverSpy.size(), 0);
+        QCOMPARE(clientSpy.size(), 0);
         QVERIFY(server.socket && server.socket->isEncrypted());
         QVERIFY(clientSocket.isEncrypted());
     } else {
-        QVERIFY(serverSpy.count() > 0);
+        QVERIFY(serverSpy.size() > 0);
         QEXPECT_FAIL("", "Failing to trigger signal, QTBUG-81661", Continue);
-        QVERIFY(clientSpy.count() > 0);
+        QVERIFY(clientSpy.size() > 0);
         QVERIFY(server.socket && !server.socket->isEncrypted());
         QVERIFY(!clientSocket.isEncrypted());
     }
@@ -5035,15 +5035,15 @@ void tst_QSslSocket::pskHandshake()
     runner.enterLoopMSecs(1000);
 
     if (pskRight) {
-        QCOMPARE(serverSpy.count(), 0);
-        QCOMPARE(clientSpy.count(), 0);
+        QCOMPARE(serverSpy.size(), 0);
+        QCOMPARE(clientSpy.size(), 0);
         QVERIFY(server.socket && server.socket->isEncrypted());
         QVERIFY(clientSocket.isEncrypted());
     } else {
-        QVERIFY(serverSpy.count() > 0);
+        QVERIFY(serverSpy.size() > 0);
         QCOMPARE(serverSpy.first().at(0).toInt(), static_cast<int>(QSsl::AlertLevel::Fatal));
         QCOMPARE(serverSpy.first().at(1).toInt(), static_cast<int>(QSsl::AlertType::BadRecordMac));
-        QVERIFY(clientSpy.count() > 0);
+        QVERIFY(clientSpy.size() > 0);
         QCOMPARE(clientSpy.first().at(0).toInt(), static_cast<int>(QSsl::AlertLevel::Fatal));
         QCOMPARE(clientSpy.first().at(1).toInt(), static_cast<int>(QSsl::AlertType::BadRecordMac));
         QVERIFY(server.socket && !server.socket->isEncrypted());