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>

7 files changed, 20 insertions, 20 deletions

diff --git a/src/plugins/tls/openssl/qdtls_openssl.cpp b/src/plugins/tls/openssl/qdtls_openssl.cpp
index fe8cbf23e0..0cb4d0b831 100644
--- a/src/plugins/tls/openssl/qdtls_openssl.cpp
+++ b/src/plugins/tls/openssl/qdtls_openssl.cpp
@@ -1252,12 +1252,12 @@ unsigned QDtlsPrivateOpenSSL::pskClientCallback(const char *hint, char *identity
         return 0;
 
     // Copy data back into OpenSSL
-    const int identityLength = qMin(pskAuthenticator.identity().length(),
+    const int identityLength = qMin(pskAuthenticator.identity().size(),
                                     pskAuthenticator.maximumIdentityLength());
     std::memcpy(identity, pskAuthenticator.identity().constData(), identityLength);
     identity[identityLength] = 0;
 
-    const int pskLength = qMin(pskAuthenticator.preSharedKey().length(),
+    const int pskLength = qMin(pskAuthenticator.preSharedKey().size(),
                                pskAuthenticator.maximumPreSharedKeyLength());
     std::memcpy(psk, pskAuthenticator.preSharedKey().constData(), pskLength);
 
@@ -1283,7 +1283,7 @@ unsigned QDtlsPrivateOpenSSL::pskServerCallback(const char *identity, unsigned c
         return 0;
 
     // Copy data back into OpenSSL
-    const int pskLength = qMin(pskAuthenticator.preSharedKey().length(),
+    const int pskLength = qMin(pskAuthenticator.preSharedKey().size(),
                                pskAuthenticator.maximumPreSharedKeyLength());
 
     std::memcpy(psk, pskAuthenticator.preSharedKey().constData(), pskLength);
diff --git a/src/plugins/tls/openssl/qsslcontext_openssl.cpp b/src/plugins/tls/openssl/qsslcontext_openssl.cpp
index 33f0d41a09..e2b89d8805 100644
--- a/src/plugins/tls/openssl/qsslcontext_openssl.cpp
+++ b/src/plugins/tls/openssl/qsslcontext_openssl.cpp
@@ -218,7 +218,7 @@ SSL* QSslContext::createSsl()
     QList<QByteArray> protocols = sslConfiguration.d.constData()->nextAllowedProtocols;
     if (!protocols.isEmpty()) {
         m_supportedNPNVersions.clear();
-        for (int a = 0; a < protocols.count(); ++a) {
+        for (int a = 0; a < protocols.size(); ++a) {
             if (protocols.at(a).size() > 255) {
                 qCWarning(lcTlsBackend) << "TLS NPN extension" << protocols.at(a)
                                  << "is too long and will be ignored.";
@@ -230,7 +230,7 @@ SSL* QSslContext::createSsl()
         }
         if (m_supportedNPNVersions.size()) {
             m_npnContext.data = reinterpret_cast<unsigned char *>(m_supportedNPNVersions.data());
-            m_npnContext.len = m_supportedNPNVersions.length();
+            m_npnContext.len = m_supportedNPNVersions.size();
             m_npnContext.status = QSslConfiguration::NextProtocolNegotiationNone;
             // Callback's type has a parameter 'const unsigned char ** out'
             // since it was introduced in 1.0.2. Internally, OpenSSL's own code
@@ -702,7 +702,7 @@ QT_WARNING_POP
         const QByteArray &params = dhparams.d->derData;
         const char *ptr = params.constData();
         DH *dh = q_d2i_DHparams(nullptr, reinterpret_cast<const unsigned char **>(&ptr),
-                                params.length());
+                                params.size());
         if (dh == nullptr)
             qFatal("q_d2i_DHparams failed to convert QSslDiffieHellmanParameters to DER form");
         q_SSL_CTX_set_tmp_dh(sslContext->ctx, dh);
diff --git a/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp b/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
index 3b9c0dc889..70506ae412 100644
--- a/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
+++ b/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
@@ -550,7 +550,7 @@ struct LibGreaterThan
     {
         const auto lhsparts = lhs.split(u'.');
         const auto rhsparts = rhs.split(u'.');
-        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(),
diff --git a/src/plugins/tls/openssl/qtls_openssl.cpp b/src/plugins/tls/openssl/qtls_openssl.cpp
index 27abf1bc8d..a78bdca53f 100644
--- a/src/plugins/tls/openssl/qtls_openssl.cpp
+++ b/src/plugins/tls/openssl/qtls_openssl.cpp
@@ -1726,11 +1726,11 @@ unsigned TlsCryptographOpenSSL::pskClientTlsCallback(const char *hint, char *ide
         return 0;
 
     // Copy data back into OpenSSL
-    const int identityLength = qMin(authenticator.identity().length(), authenticator.maximumIdentityLength());
+    const int identityLength = qMin(authenticator.identity().size(), authenticator.maximumIdentityLength());
     std::memcpy(identity, authenticator.identity().constData(), identityLength);
     identity[identityLength] = 0;
 
-    const int pskLength = qMin(authenticator.preSharedKey().length(), authenticator.maximumPreSharedKeyLength());
+    const int pskLength = qMin(authenticator.preSharedKey().size(), authenticator.maximumPreSharedKeyLength());
     std::memcpy(psk, authenticator.preSharedKey().constData(), pskLength);
     return pskLength;
 }
@@ -1752,7 +1752,7 @@ unsigned TlsCryptographOpenSSL::pskServerTlsCallback(const char *identity, unsig
         return 0;
 
     // Copy data back into OpenSSL
-    const int pskLength = qMin(authenticator.preSharedKey().length(), authenticator.maximumPreSharedKeyLength());
+    const int pskLength = qMin(authenticator.preSharedKey().size(), authenticator.maximumPreSharedKeyLength());
     std::memcpy(psk, authenticator.preSharedKey().constData(), pskLength);
     return pskLength;
 }
diff --git a/src/plugins/tls/openssl/qtlskey_openssl.cpp b/src/plugins/tls/openssl/qtlskey_openssl.cpp
index b17e1d9d74..8f54fda7fa 100644
--- a/src/plugins/tls/openssl/qtlskey_openssl.cpp
+++ b/src/plugins/tls/openssl/qtlskey_openssl.cpp
@@ -101,19 +101,19 @@ QByteArray TlsKeyOpenSSL::derFromPem(const QByteArray &pem, QMap<QByteArray, QBy
     QByteArray der(pem);
 
     int headerIndex = der.indexOf(header);
-    int footerIndex = der.indexOf(footer, headerIndex + header.length());
+    int footerIndex = der.indexOf(footer, headerIndex + header.size());
     if (type() != QSsl::PublicKey) {
         if (headerIndex == -1 || footerIndex == -1) {
             header = pkcs8Header(true);
             footer = pkcs8Footer(true);
             headerIndex = der.indexOf(header);
-            footerIndex = der.indexOf(footer, headerIndex + header.length());
+            footerIndex = der.indexOf(footer, headerIndex + header.size());
         }
         if (headerIndex == -1 || footerIndex == -1) {
             header = pkcs8Header(false);
             footer = pkcs8Footer(false);
             headerIndex = der.indexOf(header);
-            footerIndex = der.indexOf(footer, headerIndex + header.length());
+            footerIndex = der.indexOf(footer, headerIndex + header.size());
         }
     }
     if (headerIndex == -1 || footerIndex == -1)
@@ -124,7 +124,7 @@ QByteArray TlsKeyOpenSSL::derFromPem(const QByteArray &pem, QMap<QByteArray, QBy
     if (der.contains("Proc-Type:")) {
         // taken from QHttpNetworkReplyPrivate::parseHeader
         int i = 0;
-        while (i < der.length()) {
+        while (i < der.size()) {
             int j = der.indexOf(':', i); // field-name
             if (j == -1)
                 break;
@@ -143,7 +143,7 @@ QByteArray TlsKeyOpenSSL::derFromPem(const QByteArray &pem, QMap<QByteArray, QBy
                 int length = i -(hasCR ? 1: 0) - j;
                 value += der.mid(j, length).trimmed();
                 j = ++i;
-            } while (i < der.length() && (der.at(i) == ' ' || der.at(i) == '\t'));
+            } while (i < der.size() && (der.at(i) == ' ' || der.at(i) == '\t'));
             if (i == -1)
                 break; // something is wrong
 
diff --git a/src/plugins/tls/openssl/qx509_openssl.cpp b/src/plugins/tls/openssl/qx509_openssl.cpp
index 29f98755bd..0d911d086d 100644
--- a/src/plugins/tls/openssl/qx509_openssl.cpp
+++ b/src/plugins/tls/openssl/qx509_openssl.cpp
@@ -616,7 +616,7 @@ QList<QSslError> X509CertificateOpenSSL::verify(const QList<QSslCertificate> &ca
                                                 const QString &hostName)
 {
     // This was previously QSslSocketPrivate::verify().
-    if (certificateChain.count() <= 0)
+    if (certificateChain.size() <= 0)
         return {QSslError(QSslError::UnspecifiedError)};
 
     QList<QSslError> errors;
@@ -658,7 +658,7 @@ QList<QSslError> X509CertificateOpenSSL::verify(const QList<QSslCertificate> &ca
 
     // Build the chain of intermediate certificates
     STACK_OF(X509) *intermediates = nullptr;
-    if (certificateChain.length() > 1) {
+    if (certificateChain.size() > 1) {
         intermediates = (STACK_OF(X509) *) q_OPENSSL_sk_new_null();
 
         if (!intermediates) {
diff --git a/src/plugins/tls/shared/qx509_generic.cpp b/src/plugins/tls/shared/qx509_generic.cpp
index cfe2786680..e700552c43 100644
--- a/src/plugins/tls/shared/qx509_generic.cpp
+++ b/src/plugins/tls/shared/qx509_generic.cpp
@@ -188,7 +188,7 @@ bool X509CertificateGeneric::parse(const QByteArray &data)
     if (!elem.read(certStream) || elem.type() != QAsn1Element::SequenceType)
         return false;
 
-    QByteArray issuerDer = data.mid(dataStream.device()->pos() - elem.value().length(), elem.value().length());
+    QByteArray issuerDer = data.mid(dataStream.device()->pos() - elem.value().size(), elem.value().size());
     issuerInfoEntries = elem.toInfo();
 
     // validity period
@@ -215,7 +215,7 @@ bool X509CertificateGeneric::parse(const QByteArray &data)
     if (!elem.read(certStream) || elem.type() != QAsn1Element::SequenceType)
         return false;
 
-    QByteArray subjectDer = data.mid(dataStream.device()->pos() - elem.value().length(), elem.value().length());
+    QByteArray subjectDer = data.mid(dataStream.device()->pos() - elem.value().size(), elem.value().size());
     subjectInfoEntries = elem.toInfo();
     subjectMatchesIssuer = issuerDer == subjectDer;
 
@@ -285,7 +285,7 @@ bool X509CertificateGeneric::parse(const QByteArray &data)
                                 case QAsn1Element::IpAddressType: {
                                     QHostAddress ipAddress;
                                     QByteArray ipAddrValue = nameElem.value();
-                                    switch (ipAddrValue.length()) {
+                                    switch (ipAddrValue.size()) {
                                     case 4: // IPv4
                                         ipAddress = QHostAddress(qFromBigEndian(*reinterpret_cast<quint32 *>(ipAddrValue.data())));
                                         break;