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>

10 files changed, 25 insertions, 25 deletions

diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
index 5992ebd74e..103bb1e22b 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
@@ -242,9 +242,9 @@ QGLXContext::QGLXContext(Display *display, QXcbScreen *screen, const QSurfaceFor
             // Robustness must match that of the shared context.
             if (share && share->format().testOption(QSurfaceFormat::ResetNotification))
                 m_format.setOption(QSurfaceFormat::ResetNotification);
-            Q_ASSERT(glVersions.count() > 0);
+            Q_ASSERT(glVersions.size() > 0);
 
-            for (int i = 0; !m_context && i < glVersions.count(); i++) {
+            for (int i = 0; !m_context && i < glVersions.size(); i++) {
                 const int version = glVersions[i];
                 if (version > requestedVersion)
                     continue;
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
index b7576b969c..395e1b0586 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
@@ -786,7 +786,7 @@ void QXcbConnection::setStartupId(const QByteArray &nextId)
                                 atom(QXcbAtom::_NET_STARTUP_ID),
                                 atom(QXcbAtom::UTF8_STRING),
                                 8,
-                                nextId.length(),
+                                nextId.size(),
                                 nextId.constData());
         else
             xcb_delete_property(xcb_connection(), clientLeader(), atom(QXcbAtom::_NET_STARTUP_ID));
@@ -935,7 +935,7 @@ xcb_window_t QXcbConnection::clientLeader()
                                 atom(QXcbAtom::SM_CLIENT_ID),
                                 XCB_ATOM_STRING,
                                 8,
-                                session.length(),
+                                session.size(),
                                 session.constData());
         }
 #endif
diff --git a/src/plugins/platforms/xcb/qxcbconnection_screens.cpp b/src/plugins/platforms/xcb/qxcbconnection_screens.cpp
index 80c74191e0..2d62b9e99b 100644
--- a/src/plugins/platforms/xcb/qxcbconnection_screens.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection_screens.cpp
@@ -219,7 +219,7 @@ QXcbScreen *QXcbConnection::createScreen(QXcbVirtualDesktop *virtualDesktop,
 void QXcbConnection::destroyScreen(QXcbScreen *screen)
 {
     QXcbVirtualDesktop *virtualDesktop = screen->virtualDesktop();
-    if (virtualDesktop->screens().count() == 1) {
+    if (virtualDesktop->screens().size() == 1) {
         // If there are no other screens on the same virtual desktop,
         // then transform the physical screen into a fake screen.
         const QString nameWas = screen->name();
diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
index f528e8b593..6f732b57a0 100644
--- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
@@ -226,7 +226,7 @@ void QXcbConnection::xi2SetupSlavePointerDevice(void *info, bool removeExisting,
     auto *deviceInfo = reinterpret_cast<xcb_input_xi_device_info_t *>(info);
     if (removeExisting) {
 #if QT_CONFIG(tabletevent)
-        for (int i = 0; i < m_tabletData.count(); ++i) {
+        for (int i = 0; i < m_tabletData.size(); ++i) {
             if (m_tabletData.at(i).deviceId == deviceInfo->deviceid) {
                 m_tabletData.remove(i);
                 break;
@@ -1627,7 +1627,7 @@ void QXcbConnection::xi2ReportTabletEvent(const void *event, TabletData *tabletD
 
 QXcbConnection::TabletData *QXcbConnection::tabletDataForDevice(int id)
 {
-    for (int i = 0; i < m_tabletData.count(); ++i) {
+    for (int i = 0; i < m_tabletData.size(); ++i) {
         if (m_tabletData.at(i).deviceId == id)
             return &m_tabletData[i];
     }
diff --git a/src/plugins/platforms/xcb/qxcbdrag.cpp b/src/plugins/platforms/xcb/qxcbdrag.cpp
index f10ae874ca..3dc52c9f06 100644
--- a/src/plugins/platforms/xcb/qxcbdrag.cpp
+++ b/src/plugins/platforms/xcb/qxcbdrag.cpp
@@ -614,7 +614,7 @@ void QXcbDrag::stopListeningForActionListChanges()
 int QXcbDrag::findTransactionByWindow(xcb_window_t window)
 {
     int at = -1;
-    for (int i = 0; i < transactions.count(); ++i) {
+    for (int i = 0; i < transactions.size(); ++i) {
         const Transaction &t = transactions.at(i);
         if (t.target == window || t.proxy_target == window) {
             at = i;
@@ -627,7 +627,7 @@ int QXcbDrag::findTransactionByWindow(xcb_window_t window)
 int QXcbDrag::findTransactionByTime(xcb_timestamp_t timestamp)
 {
     int at = -1;
-    for (int i = 0; i < transactions.count(); ++i) {
+    for (int i = 0; i < transactions.size(); ++i) {
         const Transaction &t = transactions.at(i);
         if (t.timestamp == timestamp) {
             at = i;
@@ -720,7 +720,7 @@ void QXcbDrag::handleEnter(QPlatformWindow *, const xcb_client_message_event_t *
                 xdnd_types.append(event->data.data32[i]);
         }
     }
-    for(int i = 0; i < xdnd_types.length(); ++i)
+    for(int i = 0; i < xdnd_types.size(); ++i)
         qCDebug(lcQpaXDnd) << "    " << connection()->atomName(xdnd_types.at(i));
 }
 
@@ -1089,7 +1089,7 @@ void QXcbDrag::timerEvent(QTimerEvent* e)
 {
     if (e->timerId() == cleanup_timer) {
         bool stopTimer = true;
-        for (int i = 0; i < transactions.count(); ++i) {
+        for (int i = 0; i < transactions.size(); ++i) {
             const Transaction &t = transactions.at(i);
             if (t.targetWindow) {
                 // dnd within the same process, don't delete, these are taken care of
diff --git a/src/plugins/platforms/xcb/qxcbmime.cpp b/src/plugins/platforms/xcb/qxcbmime.cpp
index 7161af279c..9df9dd2bd9 100644
--- a/src/plugins/platforms/xcb/qxcbmime.cpp
+++ b/src/plugins/platforms/xcb/qxcbmime.cpp
@@ -80,7 +80,7 @@ bool QXcbMime::mimeDataForAtom(QXcbConnection *connection, xcb_atom_t a, QMimeDa
             && connection->atomName(a) == "text/x-moz-url") {
             const QString mozUri = QLatin1StringView(data->split('\n').constFirst()) + u'\n';
             *data = QByteArray(reinterpret_cast<const char *>(mozUri.data()),
-                               mozUri.length() * 2);
+                               mozUri.size() * 2);
         } else if (atomName == "application/x-color"_L1)
             *dataFormat = 16;
         ret = true;
diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp
index 95802503a9..30746148bc 100644
--- a/src/plugins/platforms/xcb/qxcbscreen.cpp
+++ b/src/plugins/platforms/xcb/qxcbscreen.cpp
@@ -556,11 +556,11 @@ void QXcbScreen::updateColorSpaceAndEdid()
                                                    m_edid.greenChromaticity, m_edid.blueChromaticity,
                                                    QColorSpace::TransferFunction::Gamma, m_edid.gamma);
                     } else {
-                        if (m_edid.tables.length() == 1) {
+                        if (m_edid.tables.size() == 1) {
                             m_colorSpace = QColorSpace(m_edid.whiteChromaticity, m_edid.redChromaticity,
                                                        m_edid.greenChromaticity, m_edid.blueChromaticity,
                                                        m_edid.tables[0]);
-                        } else if (m_edid.tables.length() == 3) {
+                        } else if (m_edid.tables.size() == 3) {
                             m_colorSpace = QColorSpace(m_edid.whiteChromaticity, m_edid.redChromaticity,
                                                        m_edid.greenChromaticity, m_edid.blueChromaticity,
                                                        m_edid.tables[0], m_edid.tables[1], m_edid.tables[2]);
@@ -821,7 +821,7 @@ void QXcbScreen::sendStartupMessage(const QByteArray &message) const
     ev.sequence = 0;
     ev.window = rootWindow;
     int sent = 0;
-    int length = message.length() + 1; // include NUL byte
+    int length = message.size() + 1; // include NUL byte
     const char *data = message.constData();
     do {
         if (sent == 20)
@@ -839,7 +839,7 @@ void QXcbScreen::sendStartupMessage(const QByteArray &message) const
 QRect QXcbScreen::availableGeometry() const
 {
     static bool enforceNetWorkarea = !qEnvironmentVariableIsEmpty("QT_RELY_ON_NET_WORKAREA_ATOM");
-    bool isMultiHeadSystem = virtualSiblings().length() > 1;
+    bool isMultiHeadSystem = virtualSiblings().size() > 1;
     bool useScreenGeometry = isMultiHeadSystem && !enforceNetWorkarea;
     return useScreenGeometry ? m_geometry : m_availableGeometry;
 }
diff --git a/src/plugins/platforms/xcb/qxcbsessionmanager.cpp b/src/plugins/platforms/xcb/qxcbsessionmanager.cpp
index ec305d5030..3d1229044c 100644
--- a/src/plugins/platforms/xcb/qxcbsessionmanager.cpp
+++ b/src/plugins/platforms/xcb/qxcbsessionmanager.cpp
@@ -101,7 +101,7 @@ static void sm_setProperty(const QString &name, const QString &value)
 {
     QByteArray v = value.toUtf8();
     SmPropValue prop;
-    prop.length = v.length();
+    prop.length = v.size();
     prop.value = (SmPointer) const_cast<char *>(v.constData());
     sm_setProperty(name.toLatin1().data(), SmARRAY8, 1, &prop);
 }
@@ -113,7 +113,7 @@ static void sm_setProperty(const QString &name, const QStringList &value)
     QList<QByteArray> vl;
     vl.reserve(value.size());
     for (QStringList::ConstIterator it = value.begin(); it != value.end(); ++it) {
-      prop[count].length = (*it).length();
+      prop[count].length = (*it).size();
       vl.append((*it).toUtf8());
       prop[count].value = (char*)vl.constLast().data();
       ++count;
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index 7ea0b3a29b..1040ddfb2e 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -168,7 +168,7 @@ static inline XTextProperty* qstringToXTP(Display *dpy, const QString& s)
         tp.value = (uchar*)qcs.data();
         tp.encoding = XA_STRING;
         tp.format = 8;
-        tp.nitems = qcs.length();
+        tp.nitems = qcs.size();
         free_prop = false;
     }
     return &tp;
@@ -1081,7 +1081,7 @@ void QXcbWindow::setNetWmStateOnUnmappedWindow()
     } else {
         xcb_change_property(xcb_connection(), XCB_PROP_MODE_REPLACE, m_window,
                             atom(QXcbAtom::_NET_WM_STATE), XCB_ATOM_ATOM, 32,
-                            atoms.count(), atoms.constData());
+                            atoms.size(), atoms.constData());
     }
     xcb_flush(xcb_connection());
 }
@@ -1265,7 +1265,7 @@ void QXcbWindow::setWindowIconText(const QString &title)
                         atom(QXcbAtom::_NET_WM_ICON_NAME),
                         atom(QXcbAtom::UTF8_STRING),
                         8,
-                        ba.length(),
+                        ba.size(),
                         ba.constData());
 }
 
@@ -1577,7 +1577,7 @@ void QXcbWindow::setWmWindowType(WindowTypes types, Qt::WindowFlags flags)
     } else {
         xcb_change_property(xcb_connection(), XCB_PROP_MODE_REPLACE, m_window,
                             atom(QXcbAtom::_NET_WM_WINDOW_TYPE), XCB_ATOM_ATOM, 32,
-                            atoms.count(), atoms.constData());
+                            atoms.size(), atoms.constData());
     }
     xcb_flush(xcb_connection());
 }
@@ -2549,7 +2549,7 @@ void QXcbWindow::setWindowTitle(const QXcbConnection *conn, xcb_window_t window,
                         conn->atom(QXcbAtom::_NET_WM_NAME),
                         conn->atom(QXcbAtom::UTF8_STRING),
                         8,
-                        ba.length(),
+                        ba.size(),
                         ba.constData());
 
 #if QT_CONFIG(xcb_xlib)
diff --git a/src/plugins/platforms/xcb/qxcbxsettings.cpp b/src/plugins/platforms/xcb/qxcbxsettings.cpp
index 62fd13e5b9..21828922c6 100644
--- a/src/plugins/platforms/xcb/qxcbxsettings.cpp
+++ b/src/plugins/platforms/xcb/qxcbxsettings.cpp
@@ -104,7 +104,7 @@ public:
 
     void populateSettings(const QByteArray &xSettings)
     {
-        if (xSettings.length() < 12)
+        if (xSettings.size() < 12)
             return;
         char byteOrder = xSettings.at(0);
         if (byteOrder != XCB_IMAGE_ORDER_LSB_FIRST && byteOrder != XCB_IMAGE_ORDER_MSB_FIRST) {
@@ -192,7 +192,7 @@ QXcbXSettings::QXcbXSettings(QXcbVirtualDesktop *screen)
     auto atom_reply = Q_XCB_REPLY(xcb_intern_atom,
                                   screen->xcb_connection(),
                                   true,
-                                  settings_atom_for_screen.length(),
+                                  settings_atom_for_screen.size(),
                                   settings_atom_for_screen.constData());
     if (!atom_reply)
         return;