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>

8 files changed, 18 insertions, 18 deletions

diff --git a/src/gui/painting/qbackingstoredefaultcompositor.cpp b/src/gui/painting/qbackingstoredefaultcompositor.cpp
index 913afed846..8f624210da 100644
--- a/src/gui/painting/qbackingstoredefaultcompositor.cpp
+++ b/src/gui/painting/qbackingstoredefaultcompositor.cpp
@@ -148,7 +148,7 @@ static QRegion scaledRegion(const QRegion &region, qreal factor, const QPoint &o
         rects.append(scaledRect(rect.translated(offset), factor));
 
     QRegion deviceRegion;
-    deviceRegion.setRects(rects.constData(), rects.count());
+    deviceRegion.setRects(rects.constData(), rects.size());
     return deviceRegion;
 }
 
@@ -518,7 +518,7 @@ QPlatformBackingStore::FlushResult QBackingStoreDefaultCompositor::flush(QPlatfo
     }
 
     const int textureWidgetCount = textures->count();
-    const int oldTextureQuadDataCount = m_textureQuadData.count();
+    const int oldTextureQuadDataCount = m_textureQuadData.size();
     if (oldTextureQuadDataCount != textureWidgetCount) {
         for (int i = textureWidgetCount; i < oldTextureQuadDataCount; ++i)
             m_textureQuadData[i].reset();
diff --git a/src/gui/painting/qcolortransfertable_p.h b/src/gui/painting/qcolortransfertable_p.h
index 4563acf1fa..dc0f5804fd 100644
--- a/src/gui/painting/qcolortransfertable_p.h
+++ b/src/gui/painting/qcolortransfertable_p.h
@@ -35,12 +35,12 @@ public:
     QColorTransferTable(uint32_t size, const QList<uint8_t> &table) noexcept
         : m_tableSize(size), m_table8(table)
     {
-        Q_ASSERT(qsizetype(size) <= table.count());
+        Q_ASSERT(qsizetype(size) <= table.size());
     }
     QColorTransferTable(uint32_t size, const QList<uint16_t> &table) noexcept
         : m_tableSize(size), m_table16(table)
     {
-        Q_ASSERT(qsizetype(size) <= table.count());
+        Q_ASSERT(qsizetype(size) <= table.size());
     }
 
     bool isEmpty() const
diff --git a/src/gui/painting/qpageranges.cpp b/src/gui/painting/qpageranges.cpp
index 7d62c7c321..2c4d5cca6c 100644
--- a/src/gui/painting/qpageranges.cpp
+++ b/src/gui/painting/qpageranges.cpp
@@ -14,7 +14,7 @@ QT_IMPL_METATYPE_EXTERN(QPageRanges)
 
 void QPageRangesPrivate::mergeIntervals()
 {
-    const int count = intervals.count();
+    const int count = intervals.size();
 
     if (count <= 1)
         return;
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 0ccfccb19e..a424954ad4 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -5591,7 +5591,7 @@ void QPainter::drawText(const QPointF &p, const QString &str, int tf, int justif
     }
     engine.itemize();
     QScriptLine line;
-    line.length = str.length();
+    line.length = str.size();
     engine.shapeLine(line);
 
     int nItems = engine.layoutData->items.size();
@@ -5646,7 +5646,7 @@ void QPainter::drawText(const QRect &r, int flags, const QString &str, QRect *br
 
     Q_D(QPainter);
 
-    if (!d->engine || str.length() == 0 || pen().style() == Qt::NoPen)
+    if (!d->engine || str.size() == 0 || pen().style() == Qt::NoPen)
         return;
 
     if (!d->extended)
@@ -5733,7 +5733,7 @@ void QPainter::drawText(const QRectF &r, int flags, const QString &str, QRectF *
 
     Q_D(QPainter);
 
-    if (!d->engine || str.length() == 0 || pen().style() == Qt::NoPen)
+    if (!d->engine || str.size() == 0 || pen().style() == Qt::NoPen)
         return;
 
     if (!d->extended)
@@ -5852,7 +5852,7 @@ void QPainter::drawText(const QRectF &r, const QString &text, const QTextOption
 
     Q_D(QPainter);
 
-    if (!d->engine || text.length() == 0 || pen().style() == Qt::NoPen)
+    if (!d->engine || text.size() == 0 || pen().style() == Qt::NoPen)
         return;
 
     if (!d->extended)
@@ -6343,7 +6343,7 @@ QRectF QPainter::boundingRect(const QRectF &r, const QString &text, const QTextO
 {
     Q_D(QPainter);
 
-    if (!d->engine || text.length() == 0)
+    if (!d->engine || text.size() == 0)
         return QRectF(r.x(),r.y(), 0,0);
 
     QRectF br;
@@ -7133,7 +7133,7 @@ start_lengthVariant:
     // compatible behaviour to the old implementation. Replace
     // tabs by spaces
     int old_offset = offset;
-    for (; offset < text.length(); offset++) {
+    for (; offset < text.size(); offset++) {
         QChar chr = text.at(offset);
         if (chr == u'\r' || (singleline && chr == u'\n')) {
             text[offset] = u' ';
diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp
index ed0208772a..28d4216de9 100644
--- a/src/gui/painting/qpdf.cpp
+++ b/src/gui/painting/qpdf.cpp
@@ -1938,7 +1938,7 @@ void QPdfEnginePrivate::embedFont(QFontSubset *font)
         addXrefEntry(toUnicode);
         QByteArray touc = font->createToUnicodeMap();
         xprintf("<< /Length %d >>\n"
-                "stream\n", touc.length());
+                "stream\n", touc.size());
         write(touc);
         write("\nendstream\n"
               "endobj\n");
@@ -2335,7 +2335,7 @@ int QPdfEnginePrivate::writeImage(const QByteArray &data, int width, int height,
         //qDebug("DCT");
         xprintf("/Filter /DCTDecode\n>>\nstream\n");
         write(data);
-        len = data.length();
+        len = data.size();
     } else {
         if (do_compress)
             xprintf("/Filter /FlateDecode\n>>\nstream\n");
@@ -2666,7 +2666,7 @@ int QPdfEnginePrivate::gradientBrush(const QBrush &b, const QTransform &matrix,
                 "/Shading << /Shader" << alphaShaderObject << alphaShaderObject << "0 R >>\n"
                 ">>\n";
 
-            f << "/Length " << content.length() << "\n"
+            f << "/Length " << content.size() << "\n"
                 ">>\n"
                 "stream\n"
               << content
@@ -2784,7 +2784,7 @@ int QPdfEnginePrivate::addBrushPattern(const QTransform &m, bool *specifyColor,
         s << "/XObject << /Im" << imageObject << ' ' << imageObject << "0 R >> ";
     }
     s << ">>\n"
-        "/Length " << pattern.length() << "\n"
+        "/Length " << pattern.size() << "\n"
         ">>\n"
         "stream\n"
       << pattern
diff --git a/src/gui/painting/qpdf_p.h b/src/gui/painting/qpdf_p.h
index 92a848e0d1..4c6a570e76 100644
--- a/src/gui/painting/qpdf_p.h
+++ b/src/gui/painting/qpdf_p.h
@@ -293,7 +293,7 @@ private:
     }
 
     int writeCompressed(const char *src, int len);
-    inline int writeCompressed(const QByteArray &data) { return writeCompressed(data.constData(), data.length()); }
+    inline int writeCompressed(const QByteArray &data) { return writeCompressed(data.constData(), data.size()); }
     int writeCompressed(QIODevice *dev);
 
     struct AttachmentInfo
diff --git a/src/gui/painting/qplatformbackingstore.cpp b/src/gui/painting/qplatformbackingstore.cpp
index befd3a4197..8a23003065 100644
--- a/src/gui/painting/qplatformbackingstore.cpp
+++ b/src/gui/painting/qplatformbackingstore.cpp
@@ -68,7 +68,7 @@ QPlatformTextureList::~QPlatformTextureList()
 int QPlatformTextureList::count() const
 {
     Q_D(const QPlatformTextureList);
-    return d->textures.count();
+    return d->textures.size();
 }
 
 QRhiTexture *QPlatformTextureList::texture(int index) const
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp
index ea5fe8030f..8aecf16729 100644
--- a/src/gui/painting/qtransform.cpp
+++ b/src/gui/painting/qtransform.cpp
@@ -1513,7 +1513,7 @@ QRegion QTransform::map(const QRegion &r) const
                 if (!nr.isEmpty())
                     rects.append(nr);
             }
-            res.setRects(rects.constData(), rects.count());
+            res.setRects(rects.constData(), rects.size());
         }
         return res;
     }