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>

4 files changed, 27 insertions, 27 deletions

diff --git a/src/gui/accessible/linux/atspiadaptor.cpp b/src/gui/accessible/linux/atspiadaptor.cpp
index 085f634590..2e6fb720c5 100644
--- a/src/gui/accessible/linux/atspiadaptor.cpp
+++ b/src/gui/accessible/linux/atspiadaptor.cpp
@@ -976,14 +976,14 @@ void AtSpiAdaptor::notify(QAccessibleEvent *event)
 
             if (!textRemoved.isEmpty()) {
                 data.setVariant(QVariant::fromValue(textRemoved));
-                QVariantList args = packDBusSignalArguments("delete"_L1, changePosition, textRemoved.length(), QVariant::fromValue(data));
+                QVariantList args = packDBusSignalArguments("delete"_L1, changePosition, textRemoved.size(), QVariant::fromValue(data));
                 sendDBusSignal(path, ATSPI_DBUS_INTERFACE_EVENT_OBJECT ""_L1,
                                "TextChanged"_L1, args);
             }
 
             if (!textInserted.isEmpty()) {
                 data.setVariant(QVariant::fromValue(textInserted));
-                QVariantList args = packDBusSignalArguments("insert"_L1, changePosition, textInserted.length(), QVariant::fromValue(data));
+                QVariantList args = packDBusSignalArguments("insert"_L1, changePosition, textInserted.size(), QVariant::fromValue(data));
                 sendDBusSignal(path, ATSPI_DBUS_INTERFACE_EVENT_OBJECT ""_L1,
                                "TextChanged"_L1, args);
             }
@@ -2063,13 +2063,13 @@ namespace
     QString atspiColor(const QString &ia2Color)
     {
         // "rgb(%u,%u,%u)" -> "%u,%u,%u"
-        return ia2Color.mid(4, ia2Color.length() - (4+1));
+        return ia2Color.mid(4, ia2Color.size() - (4+1));
     }
 
     QString atspiSize(const QString &ia2Size)
     {
         // "%fpt" -> "%f"
-        return ia2Size.left(ia2Size.length() - 2);
+        return ia2Size.left(ia2Size.size() - 2);
     }
 
     AtSpiAttribute atspiTextAttribute(const QString &ia2Name, const QString &ia2Value)
@@ -2282,7 +2282,7 @@ static QString textForRange(QAccessibleInterface *accessible, int startOffset, i
     }
     QString txt = accessible->text(QAccessible::Value);
     if (endOffset == -1)
-        endOffset = txt.length();
+        endOffset = txt.size();
     return txt.mid(startOffset, endOffset - startOffset);
 }
 
@@ -2290,7 +2290,7 @@ static void replaceTextFallback(QAccessibleInterface *accessible, long startOffs
 {
     QString t = textForRange(accessible, 0, -1);
     if (endOffset == -1)
-        endOffset = t.length();
+        endOffset = t.size();
     if (endOffset - startOffset == 0)
         t.insert(startOffset, txt);
     else
diff --git a/src/gui/accessible/linux/qspiapplicationadaptor.cpp b/src/gui/accessible/linux/qspiapplicationadaptor.cpp
index 1cac4598ca..963490d056 100644
--- a/src/gui/accessible/linux/qspiapplicationadaptor.cpp
+++ b/src/gui/accessible/linux/qspiapplicationadaptor.cpp
@@ -173,11 +173,11 @@ QKeyEvent* QSpiApplicationAdaptor::copyKeyEvent(QKeyEvent* old)
 
 void QSpiApplicationAdaptor::notifyKeyboardListenerCallback(const QDBusMessage& message)
 {
-    if (!keyEvents.length()) {
+    if (!keyEvents.size()) {
         qWarning("QSpiApplication::notifyKeyboardListenerCallback with no queued key called");
         return;
     }
-    Q_ASSERT(message.arguments().length() == 1);
+    Q_ASSERT(message.arguments().size() == 1);
     if (message.arguments().at(0).toBool() == true) {
         QPair<QPointer<QObject>, QKeyEvent*> event = keyEvents.dequeue();
         delete event.second;
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index 841c31a115..233231c797 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -2008,7 +2008,7 @@ static QString textLineBoundary(int beforeAtAfter, const QString &text, int offs
 {
     Q_ASSERT(beforeAtAfter >= -1 && beforeAtAfter <= 1);
     Q_ASSERT(*startOffset == -1 && *endOffset == -1);
-    int length = text.length();
+    int length = text.size();
     Q_ASSERT(offset >= 0 && offset <= length);
 
     // move offset into the right range (if asking for line before or after
@@ -2057,10 +2057,10 @@ QString QAccessibleTextInterface::textBeforeOffset(int offset, QAccessible::Text
     const QString txt = text(0, characterCount());
 
     if (offset == -1)
-        offset = txt.length();
+        offset = txt.size();
 
     *startOffset = *endOffset = -1;
-    if (txt.isEmpty() || offset <= 0 || offset > txt.length())
+    if (txt.isEmpty() || offset <= 0 || offset > txt.size())
         return QString();
 
     // type initialized just to silence a compiler warning [-Werror=maybe-uninitialized]
@@ -2131,10 +2131,10 @@ QString QAccessibleTextInterface::textAfterOffset(int offset, QAccessible::TextB
     const QString txt = text(0, characterCount());
 
     if (offset == -1)
-        offset = txt.length();
+        offset = txt.size();
 
     *startOffset = *endOffset = -1;
-    if (txt.isEmpty() || offset < 0 || offset >= txt.length())
+    if (txt.isEmpty() || offset < 0 || offset >= txt.size())
         return QString();
 
     // type initialized just to silence a compiler warning [-Werror=maybe-uninitialized]
@@ -2169,20 +2169,20 @@ QString QAccessibleTextInterface::textAfterOffset(int offset, QAccessible::TextB
         int toNext = boundary.toNextBoundary();
         if ((boundary.boundaryReasons() & (QTextBoundaryFinder::StartOfItem | QTextBoundaryFinder::EndOfItem)))
             break;
-        if (toNext < 0 || toNext >= txt.length())
+        if (toNext < 0 || toNext >= txt.size())
             break; // not found, the boundary might not exist
     }
-    Q_ASSERT(boundary.position() <= txt.length());
+    Q_ASSERT(boundary.position() <= txt.size());
     *startOffset = boundary.position();
 
     while (true) {
         int toNext = boundary.toNextBoundary();
         if ((boundary.boundaryReasons() & (QTextBoundaryFinder::StartOfItem | QTextBoundaryFinder::EndOfItem)))
             break;
-        if (toNext < 0 || toNext >= txt.length())
+        if (toNext < 0 || toNext >= txt.size())
             break; // not found, the boundary might not exist
     }
-    Q_ASSERT(boundary.position() <= txt.length());
+    Q_ASSERT(boundary.position() <= txt.size());
     *endOffset = boundary.position();
 
     if ((*startOffset == -1) || (*endOffset == -1) || (*startOffset == *endOffset)) {
@@ -2216,13 +2216,13 @@ QString QAccessibleTextInterface::textAtOffset(int offset, QAccessible::TextBoun
     const QString txt = text(0, characterCount());
 
     if (offset == -1)
-        offset = txt.length();
+        offset = txt.size();
 
     *startOffset = *endOffset = -1;
-    if (txt.isEmpty() || offset < 0 || offset > txt.length())
+    if (txt.isEmpty() || offset < 0 || offset > txt.size())
         return QString();
 
-    if (offset == txt.length() && boundaryType == QAccessible::CharBoundary)
+    if (offset == txt.size() && boundaryType == QAccessible::CharBoundary)
         return QString();
 
     // type initialized just to silence a compiler warning [-Werror=maybe-uninitialized]
@@ -2243,7 +2243,7 @@ QString QAccessibleTextInterface::textAtOffset(int offset, QAccessible::TextBoun
         return textLineBoundary(0, txt, offset, startOffset, endOffset);
     case QAccessible::NoBoundary:
         *startOffset = 0;
-        *endOffset = txt.length();
+        *endOffset = txt.size();
         return txt;
     default:
         Q_UNREACHABLE();
@@ -2261,11 +2261,11 @@ QString QAccessibleTextInterface::textAtOffset(int offset, QAccessible::TextBoun
     Q_ASSERT(boundary.position() >= 0);
     *startOffset = boundary.position();
 
-    while (boundary.toNextBoundary() < txt.length()) {
+    while (boundary.toNextBoundary() < txt.size()) {
         if ((boundary.boundaryReasons() & (QTextBoundaryFinder::StartOfItem | QTextBoundaryFinder::EndOfItem)))
             break;
     }
-    Q_ASSERT(boundary.position() <= txt.length());
+    Q_ASSERT(boundary.position() <= txt.size());
     *endOffset = boundary.position();
 
     return txt.mid(*startOffset, *endOffset - *startOffset);
diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h
index b5e155c01e..6af8573c1d 100644
--- a/src/gui/accessible/qaccessible.h
+++ b/src/gui/accessible/qaccessible.h
@@ -409,13 +409,13 @@ class Q_GUI_EXPORT QAccessibleTextInsertEvent : public QAccessibleTextCursorEven
 {
 public:
     inline QAccessibleTextInsertEvent(QObject *obj, int position, const QString &text)
-        : QAccessibleTextCursorEvent(obj, position + int(text.length()))
+        : QAccessibleTextCursorEvent(obj, position + int(text.size()))
         , m_position(position), m_text(text)
     {
         m_type = QAccessible::TextInserted;
     }
     inline QAccessibleTextInsertEvent(QAccessibleInterface *iface, int position, const QString &text)
-        : QAccessibleTextCursorEvent(iface, position + int(text.length()))
+        : QAccessibleTextCursorEvent(iface, position + int(text.size()))
         , m_position(position), m_text(text)
     {
         m_type = QAccessible::TextInserted;
@@ -469,13 +469,13 @@ class Q_GUI_EXPORT QAccessibleTextUpdateEvent : public QAccessibleTextCursorEven
 {
 public:
     inline QAccessibleTextUpdateEvent(QObject *obj, int position, const QString &oldText, const QString &text)
-        : QAccessibleTextCursorEvent(obj, position + int(text.length()))
+        : QAccessibleTextCursorEvent(obj, position + int(text.size()))
         , m_position(position), m_oldText(oldText), m_text(text)
     {
         m_type = QAccessible::TextUpdated;
     }
     inline QAccessibleTextUpdateEvent(QAccessibleInterface *iface, int position, const QString &oldText, const QString &text)
-        : QAccessibleTextCursorEvent(iface, position + int(text.length()))
+        : QAccessibleTextCursorEvent(iface, position + int(text.size()))
         , m_position(position), m_oldText(oldText), m_text(text)
     {
         m_type = QAccessible::TextUpdated;