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>

5 files changed, 24 insertions, 24 deletions

diff --git a/src/gui/util/qedidparser.cpp b/src/gui/util/qedidparser.cpp
index 191eea710b..9724fbc59c 100644
--- a/src/gui/util/qedidparser.cpp
+++ b/src/gui/util/qedidparser.cpp
@@ -72,7 +72,7 @@ static QString lookupVendorIdInSystemDatabase(QByteArrayView id)
 bool QEdidParser::parse(const QByteArray &blob)
 {
     const quint8 *data = reinterpret_cast<const quint8 *>(blob.constData());
-    const size_t length = blob.length();
+    const size_t length = blob.size();
 
     // Verify header
     if (length < 128)
diff --git a/src/gui/util/qgridlayoutengine.cpp b/src/gui/util/qgridlayoutengine.cpp
index 25c02cba51..1cc42d3260 100644
--- a/src/gui/util/qgridlayoutengine.cpp
+++ b/src/gui/util/qgridlayoutengine.cpp
@@ -16,7 +16,7 @@ using namespace Qt::StringLiterals;
 template<typename T>
 static void insertOrRemoveItems(QList<T> &items, int index, int delta)
 {
-    int count = items.count();
+    int count = items.size();
     if (index < count) {
         if (delta > 0) {
             items.insert(index, delta, T());
@@ -773,7 +773,7 @@ int QGridLayoutEngine::columnCount(Qt::Orientation orientation) const
 
 int QGridLayoutEngine::itemCount() const
 {
-    return q_items.count();
+    return q_items.size();
 }
 
 QGridLayoutItem *QGridLayoutEngine::itemAt(int index) const
@@ -818,7 +818,7 @@ void QGridLayoutEngine::setRowSpacing(int row, qreal spacing, Qt::Orientation or
     Q_ASSERT(row >= 0);
 
     QGridLayoutRowInfo &rowInfo = q_infos[orientation];
-    if (row >= rowInfo.spacings.count())
+    if (row >= rowInfo.spacings.size())
         rowInfo.spacings.resize(row + 1);
     if (spacing >= 0)
         rowInfo.spacings[row].setUserValue(spacing);
@@ -843,7 +843,7 @@ void QGridLayoutEngine::setRowStretchFactor(int row, int stretch, Qt::Orientatio
     maybeExpandGrid(row, -1, orientation);
 
     QGridLayoutRowInfo &rowInfo = q_infos[orientation];
-    if (row >= rowInfo.stretches.count())
+    if (row >= rowInfo.stretches.size())
         rowInfo.stretches.resize(row + 1);
     rowInfo.stretches[row].setUserValue(stretch);
 }
@@ -865,7 +865,7 @@ void QGridLayoutEngine::setRowSizeHint(Qt::SizeHint which, int row, qreal size,
     maybeExpandGrid(row, -1, orientation);
 
     QGridLayoutRowInfo &rowInfo = q_infos[orientation];
-    if (row >= rowInfo.boxes.count())
+    if (row >= rowInfo.boxes.size())
         rowInfo.boxes.resize(row + 1);
     rowInfo.boxes[row].q_sizes(which) = size;
 }
@@ -883,7 +883,7 @@ void QGridLayoutEngine::setRowAlignment(int row, Qt::Alignment alignment,
     maybeExpandGrid(row, -1, orientation);
 
     QGridLayoutRowInfo &rowInfo = q_infos[orientation];
-    if (row >= rowInfo.alignments.count())
+    if (row >= rowInfo.alignments.size())
         rowInfo.alignments.resize(row + 1);
     rowInfo.alignments[row] = alignment;
 }
@@ -992,7 +992,7 @@ void QGridLayoutEngine::setGeometries(const QRectF &contentsGeometry, const QAbs
 
     ensureGeometries(contentsGeometry.size(), styleInfo);
 
-    for (int i = q_items.count() - 1; i >= 0; --i) {
+    for (int i = q_items.size() - 1; i >= 0; --i) {
         QGridLayoutItem *item = q_items.at(i);
 
         qreal x = q_xx.at(item->firstColumn());
@@ -1121,7 +1121,7 @@ void QGridLayoutEngine::transpose()
 {
     invalidate();
 
-    for (int i = q_items.count() - 1; i >= 0; --i)
+    for (int i = q_items.size() - 1; i >= 0; --i)
         q_items.at(i)->transpose();
 
     q_defaultSpacings.transpose();
@@ -1210,7 +1210,7 @@ void QGridLayoutEngine::maybeExpandGrid(int row, int column, Qt::Orientation ori
     int newGridColumnCount = internalGridColumnCount();
 
     int newGridSize = newGridRowCount * newGridColumnCount;
-    if (newGridSize != q_grid.count()) {
+    if (newGridSize != q_grid.size()) {
         q_grid.resize(newGridSize);
 
         if (newGridColumnCount != oldGridColumnCount) {
@@ -1232,7 +1232,7 @@ void QGridLayoutEngine::regenerateGrid()
 {
     q_grid.fill(nullptr);
 
-    for (int i = q_items.count() - 1; i >= 0; --i) {
+    for (int i = q_items.size() - 1; i >= 0; --i) {
         QGridLayoutItem *item = q_items.at(i);
 
         for (int j = item->firstRow(); j <= item->lastRow(); ++j) {
@@ -1265,7 +1265,7 @@ void QGridLayoutEngine::insertOrRemoveRows(int row, int delta, Qt::Orientation o
 
     q_infos[orientation].insertOrRemoveRows(row, delta);
 
-    for (int i = q_items.count() - 1; i >= 0; --i)
+    for (int i = q_items.size() - 1; i >= 0; --i)
         q_items.at(i)->insertOrRemoveRows(row, delta, orientation);
 
     q_grid.resize(internalGridRowCount() * internalGridColumnCount());
@@ -1406,7 +1406,7 @@ void QGridLayoutEngine::fillRowData(QGridLayoutRowData *rowData,
                 }
             }
         }
-        if (row < rowInfo.boxes.count()) {
+        if (row < rowInfo.boxes.size()) {
             QGridLayoutBox rowBoxInfo = rowInfo.boxes.at(row);
             rowBoxInfo.normalize();
             rowBox.q_minimumSize = qMax(rowBox.q_minimumSize, rowBoxInfo.q_minimumSize);
@@ -1510,7 +1510,7 @@ void QGridLayoutEngine::ensureEffectiveFirstAndLastRows() const
         q_cachedEffectiveFirstRows = {columnCount, rowCount};
         q_cachedEffectiveLastRows = {-1, -1};
 
-        for (int i = q_items.count() - 1; i >= 0; --i) {
+        for (int i = q_items.size() - 1; i >= 0; --i) {
             const QGridLayoutItem *item = q_items.at(i);
 
             for (Qt::Orientation o : {Qt::Horizontal, Qt::Vertical}) {
@@ -1556,7 +1556,7 @@ void QGridLayoutEngine::ensureColumnAndRowData(QGridLayoutRowData *rowData, QGri
 bool QGridLayoutEngine::ensureDynamicConstraint() const
 {
     if (q_cachedConstraintOrientation == UnknownConstraint) {
-        for (int i = q_items.count() - 1; i >= 0; --i) {
+        for (int i = q_items.size() - 1; i >= 0; --i) {
             QGridLayoutItem *item = q_items.at(i);
             if (item->hasDynamicConstraint()) {
                 Qt::Orientation itemConstraintOrientation = item->dynamicConstraintOrientation();
diff --git a/src/gui/util/qktxhandler.cpp b/src/gui/util/qktxhandler.cpp
index 85e3428bf0..f7e0e60330 100644
--- a/src/gui/util/qktxhandler.cpp
+++ b/src/gui/util/qktxhandler.cpp
@@ -117,7 +117,7 @@ QTextureFileData QKtxHandler::read()
     texData.setNumFaces(decode(header->numberOfFaces));
 
     const quint32 bytesOfKeyValueData = decode(header->bytesOfKeyValueData);
-    if (headerSize + bytesOfKeyValueData < quint64(buf.length())) // oob check
+    if (headerSize + bytesOfKeyValueData < quint64(buf.size())) // oob check
         texData.setKeyValueMetadata(
                 decodeKeyValues(QByteArrayView(buf.data() + headerSize, bytesOfKeyValueData)));
     quint32 offset = headerSize + bytesOfKeyValueData;
diff --git a/src/gui/util/qtexturefiledata.cpp b/src/gui/util/qtexturefiledata.cpp
index ddd99b0ffc..e1fa900b84 100644
--- a/src/gui/util/qtexturefiledata.cpp
+++ b/src/gui/util/qtexturefiledata.cpp
@@ -117,8 +117,8 @@ bool QTextureFileData::isValid() const
     if (d->data.isEmpty() || d->size.isEmpty() || (!d->format && !d->internalFormat))
         return false;
 
-    const int numFacesOffset = d->offsets.length();
-    const int numFacesLength = d->lengths.length();
+    const int numFacesOffset = d->offsets.size();
+    const int numFacesLength = d->lengths.size();
     if (numFacesOffset == 0 || numFacesLength == 0 || d->numFaces != numFacesOffset
         || d->numFaces != numFacesLength)
         return false;
diff --git a/src/gui/util/qundostack.cpp b/src/gui/util/qundostack.cpp
index 94d97216c4..403833d421 100644
--- a/src/gui/util/qundostack.cpp
+++ b/src/gui/util/qundostack.cpp
@@ -286,7 +286,7 @@ void QUndoCommand::setText(const QString &text)
 
 int QUndoCommand::childCount() const
 {
-    return d->child_list.count();
+    return d->child_list.size();
 }
 
 /*!
@@ -299,7 +299,7 @@ int QUndoCommand::childCount() const
 
 const QUndoCommand *QUndoCommand::child(int index) const
 {
-    if (index < 0 || index >= d->child_list.count())
+    if (index < 0 || index >= d->child_list.size())
         return nullptr;
     return d->child_list.at(index);
 }
@@ -444,10 +444,10 @@ void QUndoStackPrivate::setIndex(int idx, bool clean)
 
 bool QUndoStackPrivate::checkUndoLimit()
 {
-    if (undo_limit <= 0 || !macro_stack.isEmpty() || undo_limit >= command_list.count())
+    if (undo_limit <= 0 || !macro_stack.isEmpty() || undo_limit >= command_list.size())
         return false;
 
-    int del_count = command_list.count() - undo_limit;
+    int del_count = command_list.size() - undo_limit;
 
     for (int i = 0; i < del_count; ++i)
         delete command_list.takeFirst();
@@ -1142,7 +1142,7 @@ void QUndoStack::beginMacro(const QString &text)
     }
     d->macro_stack.append(cmd);
 
-    if (d->macro_stack.count() == 1) {
+    if (d->macro_stack.size() == 1) {
         emit canUndoChanged(false);
         emit undoTextChanged(QString());
         emit canRedoChanged(false);
@@ -1191,7 +1191,7 @@ const QUndoCommand *QUndoStack::command(int index) const
 {
     Q_D(const QUndoStack);
 
-    if (index < 0 || index >= d->command_list.count())
+    if (index < 0 || index >= d->command_list.size())
         return nullptr;
     return d->command_list.at(index);
 }