From df9d882d41b741fef7c5beeddb0abe9d904443d8 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Fri, 30 Sep 2022 14:09:04 +0200
Subject: 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>
---
 src/plugins/tls/openssl/qtlskey_openssl.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/plugins/tls/openssl/qtlskey_openssl.cpp')

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
 
-- 
cgit v1.2.3