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>

1 files changed, 31 insertions, 31 deletions

diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
index 27cf624c51..251b632e67 100644
--- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
@@ -959,12 +959,12 @@ void QSortFilterProxyModelPrivate::source_items_inserted(
         it = create_mapping(source_parent);
         Mapping *m = it.value();
         QModelIndex proxy_parent = q->mapFromSource(source_parent);
-        if (m->source_rows.count() > 0) {
-            q->beginInsertRows(proxy_parent, 0, m->source_rows.count() - 1);
+        if (m->source_rows.size() > 0) {
+            q->beginInsertRows(proxy_parent, 0, m->source_rows.size() - 1);
             q->endInsertRows();
         }
-        if (m->source_columns.count() > 0) {
-            q->beginInsertColumns(proxy_parent, 0, m->source_columns.count() - 1);
+        if (m->source_columns.size() > 0) {
+            q->beginInsertColumns(proxy_parent, 0, m->source_columns.size() - 1);
             q->endInsertColumns();
         }
         return;
@@ -1190,7 +1190,7 @@ void QSortFilterProxyModelPrivate::proxy_item_range(
 {
     proxy_low = INT_MAX;
     proxy_high = INT_MIN;
-    for (int i = 0; i < source_items.count(); ++i) {
+    for (int i = 0; i < source_items.size(); ++i) {
         int proxy_item = source_to_proxy.at(source_items.at(i));
         Q_ASSERT(proxy_item != -1);
         if (proxy_item < proxy_low)
@@ -1223,7 +1223,7 @@ QModelIndexPairList QSortFilterProxyModelPrivate::store_persistent_indexes() con
 {
     Q_Q(const QSortFilterProxyModel);
     QModelIndexPairList source_indexes;
-    source_indexes.reserve(persistent.indexes.count());
+    source_indexes.reserve(persistent.indexes.size());
     for (const QPersistentModelIndexData *data : qAsConst(persistent.indexes)) {
         const QModelIndex &proxy_index = data->index;
         QModelIndex source_index = q->mapToSource(proxy_index);
@@ -1327,7 +1327,7 @@ QSet<int> QSortFilterProxyModelPrivate::handle_filter_changed(
     Q_Q(QSortFilterProxyModel);
     // Figure out which mapped items to remove
     QList<int> source_items_remove;
-    for (int i = 0; i < proxy_to_source.count(); ++i) {
+    for (int i = 0; i < proxy_to_source.size(); ++i) {
         const int source_item = proxy_to_source.at(i);
         if ((orient == Qt::Vertical)
             ? !filterAcceptsRowInternal(source_item, source_parent)
@@ -1435,7 +1435,7 @@ void QSortFilterProxyModelPrivate::_q_sourceDataChanged(const QModelIndex &sourc
         QList<int> source_rows_insert;
         QList<int> source_rows_change;
         QList<int> source_rows_resort;
-        int end = qMin(source_bottom_right.row(), m->proxy_rows.count() - 1);
+        int end = qMin(source_bottom_right.row(), m->proxy_rows.size() - 1);
         for (int source_row = source_top_left.row(); source_row <= end; ++source_row) {
             if (dynamic_sortfilter && !change_in_unmapped_parent) {
                 if (m->proxy_rows.at(source_row) != -1) {
@@ -2155,7 +2155,7 @@ QModelIndex QSortFilterProxyModel::index(int row, int column, const QModelIndex
 
     QModelIndex source_parent = mapToSource(parent); // parent is already mapped at this point
     IndexMap::const_iterator it = d->create_mapping(source_parent); // but make sure that the children are mapped
-    if (it.value()->source_rows.count() <= row || it.value()->source_columns.count() <= column)
+    if (it.value()->source_rows.size() <= row || it.value()->source_columns.size() <= column)
         return QModelIndex();
 
     return d->create_index(row, column, it);
@@ -2186,7 +2186,7 @@ QModelIndex QSortFilterProxyModel::sibling(int row, int column, const QModelInde
         return QModelIndex();
 
     const IndexMap::const_iterator it = d->index_to_iterator(idx);
-    if (it.value()->source_rows.count() <= row || it.value()->source_columns.count() <= column)
+    if (it.value()->source_rows.size() <= row || it.value()->source_columns.size() <= column)
         return QModelIndex();
 
     return d->create_index(row, column, it);
@@ -2202,7 +2202,7 @@ int QSortFilterProxyModel::rowCount(const QModelIndex &parent) const
     if (parent.isValid() && !source_parent.isValid())
         return 0;
     IndexMap::const_iterator it = d->create_mapping(source_parent);
-    return it.value()->source_rows.count();
+    return it.value()->source_rows.size();
 }
 
 /*!
@@ -2215,7 +2215,7 @@ int QSortFilterProxyModel::columnCount(const QModelIndex &parent) const
     if (parent.isValid() && !source_parent.isValid())
         return 0;
     IndexMap::const_iterator it = d->create_mapping(source_parent);
-    return it.value()->source_columns.count();
+    return it.value()->source_columns.size();
 }
 
 /*!
@@ -2234,7 +2234,7 @@ bool QSortFilterProxyModel::hasChildren(const QModelIndex &parent) const
         return true; //we assume we might have children that can be fetched
 
     QSortFilterProxyModelPrivate::Mapping *m = d->create_mapping(source_parent).value();
-    return m->source_rows.count() != 0 && m->source_columns.count() != 0;
+    return m->source_rows.size() != 0 && m->source_columns.size() != 0;
 }
 
 /*!
@@ -2268,15 +2268,15 @@ QVariant QSortFilterProxyModel::headerData(int section, Qt::Orientation orientat
 {
     Q_D(const QSortFilterProxyModel);
     IndexMap::const_iterator it = d->create_mapping(QModelIndex());
-    if (it.value()->source_rows.count() * it.value()->source_columns.count() > 0)
+    if (it.value()->source_rows.size() * it.value()->source_columns.size() > 0)
         return QAbstractProxyModel::headerData(section, orientation, role);
     int source_section;
     if (orientation == Qt::Vertical) {
-        if (section < 0 || section >= it.value()->source_rows.count())
+        if (section < 0 || section >= it.value()->source_rows.size())
             return QVariant();
         source_section = it.value()->source_rows.at(section);
     } else {
-        if (section < 0 || section >= it.value()->source_columns.count())
+        if (section < 0 || section >= it.value()->source_columns.size())
             return QVariant();
         source_section = it.value()->source_columns.at(section);
     }
@@ -2291,15 +2291,15 @@ bool QSortFilterProxyModel::setHeaderData(int section, Qt::Orientation orientati
 {
     Q_D(QSortFilterProxyModel);
     IndexMap::const_iterator it = d->create_mapping(QModelIndex());
-    if (it.value()->source_rows.count() * it.value()->source_columns.count() > 0)
+    if (it.value()->source_rows.size() * it.value()->source_columns.size() > 0)
         return QAbstractProxyModel::setHeaderData(section, orientation, value, role);
     int source_section;
     if (orientation == Qt::Vertical) {
-        if (section < 0 || section >= it.value()->source_rows.count())
+        if (section < 0 || section >= it.value()->source_rows.size())
             return false;
         source_section = it.value()->source_rows.at(section);
     } else {
-        if (section < 0 || section >= it.value()->source_columns.count())
+        if (section < 0 || section >= it.value()->source_columns.size())
             return false;
         source_section = it.value()->source_columns.at(section);
     }
@@ -2359,10 +2359,10 @@ bool QSortFilterProxyModel::insertRows(int row, int count, const QModelIndex &pa
     if (parent.isValid() && !source_parent.isValid())
         return false;
     QSortFilterProxyModelPrivate::Mapping *m = d->create_mapping(source_parent).value();
-    if (row > m->source_rows.count())
+    if (row > m->source_rows.size())
         return false;
-    int source_row = (row >= m->source_rows.count()
-                      ? m->proxy_rows.count()
+    int source_row = (row >= m->source_rows.size()
+                      ? m->proxy_rows.size()
                       : m->source_rows.at(row));
     return d->model->insertRows(source_row, count, source_parent);
 }
@@ -2379,10 +2379,10 @@ bool QSortFilterProxyModel::insertColumns(int column, int count, const QModelInd
     if (parent.isValid() && !source_parent.isValid())
         return false;
     QSortFilterProxyModelPrivate::Mapping *m = d->create_mapping(source_parent).value();
-    if (column > m->source_columns.count())
+    if (column > m->source_columns.size())
         return false;
-    int source_column = (column >= m->source_columns.count()
-                         ? m->proxy_columns.count()
+    int source_column = (column >= m->source_columns.size()
+                         ? m->proxy_columns.size()
                          : m->source_columns.at(column));
     return d->model->insertColumns(source_column, count, source_parent);
 }
@@ -2399,10 +2399,10 @@ bool QSortFilterProxyModel::removeRows(int row, int count, const QModelIndex &pa
     if (parent.isValid() && !source_parent.isValid())
         return false;
     QSortFilterProxyModelPrivate::Mapping *m = d->create_mapping(source_parent).value();
-    if (row + count > m->source_rows.count())
+    if (row + count > m->source_rows.size())
         return false;
     if ((count == 1)
-        || ((d->source_sort_column < 0) && (m->proxy_rows.count() == m->source_rows.count()))) {
+        || ((d->source_sort_column < 0) && (m->proxy_rows.size() == m->source_rows.size()))) {
         int source_row = m->source_rows.at(row);
         return d->model->removeRows(source_row, count, source_parent);
     }
@@ -2414,7 +2414,7 @@ bool QSortFilterProxyModel::removeRows(int row, int count, const QModelIndex &pa
         rows.append(m->source_rows.at(i));
     std::sort(rows.begin(), rows.end());
 
-    int pos = rows.count() - 1;
+    int pos = rows.size() - 1;
     bool ok = true;
     while (pos >= 0) {
         const int source_end = rows.at(pos--);
@@ -2441,9 +2441,9 @@ bool QSortFilterProxyModel::removeColumns(int column, int count, const QModelInd
     if (parent.isValid() && !source_parent.isValid())
         return false;
     QSortFilterProxyModelPrivate::Mapping *m = d->create_mapping(source_parent).value();
-    if (column + count > m->source_columns.count())
+    if (column + count > m->source_columns.size())
         return false;
-    if ((count == 1) || (m->proxy_columns.count() == m->source_columns.count())) {
+    if ((count == 1) || (m->proxy_columns.size() == m->source_columns.size())) {
         int source_column = m->source_columns.at(column);
         return d->model->removeColumns(source_column, count, source_parent);
     }
@@ -2453,7 +2453,7 @@ bool QSortFilterProxyModel::removeColumns(int column, int count, const QModelInd
     for (int i = column; i < column + count; ++i)
         columns.append(m->source_columns.at(i));
 
-    int pos = columns.count() - 1;
+    int pos = columns.size() - 1;
     bool ok = true;
     while (pos >= 0) {
         const int source_end = columns.at(pos--);