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

This is a semantic patch using ClangTidyTransformator as in
qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8:

  auto QtContainerClass = anyOf(
      expr(hasType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))))).bind(o),
      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',
with the extended set of container classes recognized.

Change-Id: Ic219197507870fd2b739f2e04ff138021e58d550
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

5 files changed, 8 insertions, 8 deletions

diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index 085af7d..06ab5ef 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -380,7 +380,7 @@ void QWebSocketPrivate::close(QWebSocketProtocol::CloseCode closeCode, QString r
         QByteArray frame = getFrameHeader(QWebSocketProtocol::OpCodeClose,
                                           quint64(payload.size()), maskingKey, true);
 
-        Q_ASSERT(payload.length() <= 125);
+        Q_ASSERT(payload.size() <= 125);
         frame.append(payload);
         m_pSocket->write(frame);
         m_pSocket->flush();
@@ -1251,7 +1251,7 @@ QString QWebSocketPrivate::createHandShakeRequest(QString resourceName,
         handshakeRequest << QStringLiteral("Origin: ") % origin;
     handshakeRequest << QStringLiteral("Sec-WebSocket-Version: ")
                             % QString::number(QWebSocketProtocol::currentVersion());
-    if (extensions.length() > 0)
+    if (extensions.size() > 0)
         handshakeRequest << QStringLiteral("Sec-WebSocket-Extensions: ") % extensions;
 
     const QStringList validProtocols = [&] {
diff --git a/src/websockets/qwebsocketdataprocessor.cpp b/src/websockets/qwebsocketdataprocessor.cpp
index 2576d66..27da96b 100644
--- a/src/websockets/qwebsocketdataprocessor.cpp
+++ b/src/websockets/qwebsocketdataprocessor.cpp
@@ -152,9 +152,9 @@ bool QWebSocketDataProcessor::process(QIODevice *pIoDevice)
                     m_isFragmented = !frame.isFinalFrame();
                 }
                 quint64 messageLength = m_opCode == QWebSocketProtocol::OpCodeText
-                        ? quint64(m_textMessage.length())
-                        : quint64(m_binaryMessage.length());
-                if (Q_UNLIKELY((messageLength + quint64(frame.payload().length())) >
+                        ? quint64(m_textMessage.size())
+                        : quint64(m_binaryMessage.size());
+                if (Q_UNLIKELY((messageLength + quint64(frame.payload().size())) >
                                maxAllowedMessageSize())) {
                     clear();
                     Q_EMIT errorEncountered(QWebSocketProtocol::CloseCodeTooMuchData,
diff --git a/src/websockets/qwebsocketframe.cpp b/src/websockets/qwebsocketframe.cpp
index 80c1e89..ac29d1c 100644
--- a/src/websockets/qwebsocketframe.cpp
+++ b/src/websockets/qwebsocketframe.cpp
@@ -352,7 +352,7 @@ QWebSocketFrame::ProcessingState QWebSocketFrame::readFramePayload(QIODevice *pI
         m_payload = pIoDevice->read(int(m_length));
         // m_length can be safely cast to an integer,
         // because MAX_FRAME_SIZE_IN_BYTES = MAX_INT
-        if (Q_UNLIKELY(m_payload.length() != int(m_length))) {
+        if (Q_UNLIKELY(m_payload.size() != int(m_length))) {
             // some error occurred; refer to the Qt documentation of QIODevice::read()
             setError(QWebSocketProtocol::CloseCodeAbnormalDisconnection,
                      tr("Some serious error occurred while reading from the network."));
diff --git a/src/websockets/qwebsockethandshakerequest.cpp b/src/websockets/qwebsockethandshakerequest.cpp
index 80683f4..59f215b 100644
--- a/src/websockets/qwebsockethandshakerequest.cpp
+++ b/src/websockets/qwebsockethandshakerequest.cpp
@@ -204,7 +204,7 @@ void QWebSocketHandshakeRequest::readHandshake(QByteArrayView header, int maxHea
         return;
     }
     const QStringList tokens = requestLine.split(QLatin1Char(' '), Qt::SkipEmptyParts);
-    if (Q_UNLIKELY(tokens.length() < 3)) {
+    if (Q_UNLIKELY(tokens.size() < 3)) {
         clear();
         return;
     }
diff --git a/src/websockets/qwebsocketserver_p.cpp b/src/websockets/qwebsocketserver_p.cpp
index 5adfd1f..a0afd10 100644
--- a/src/websockets/qwebsocketserver_p.cpp
+++ b/src/websockets/qwebsocketserver_p.cpp
@@ -470,7 +470,7 @@ void QWebSocketServerPrivate::handshakeReceived()
     bool success = false;
     bool isSecure = (m_secureMode == SecureMode);
 
-    if (Q_UNLIKELY(m_pendingConnections.length() >= maxPendingConnections())) {
+    if (Q_UNLIKELY(m_pendingConnections.size() >= maxPendingConnections())) {
         pTcpSocket->close();
         setError(QWebSocketProtocol::CloseCodeAbnormalDisconnection,
                  QWebSocketServer::tr("Too many pending connections."));