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>

6 files changed, 24 insertions, 24 deletions

diff --git a/src/sql/kernel/qsqldriver.cpp b/src/sql/kernel/qsqldriver.cpp
index 997441ab49..7c8c329d64 100644
--- a/src/sql/kernel/qsqldriver.cpp
+++ b/src/sql/kernel/qsqldriver.cpp
@@ -516,7 +516,7 @@ QString QSqlDriver::sqlStatement(StatementType type, const QString &tableName,
             s.clear();
         } else {
             vals.chop(2); // remove trailing comma
-            s[s.length() - 2] = u')';
+            s[s.size() - 2] = u')';
             s.append("VALUES ("_L1).append(vals).append(u')');
         }
         break; }
@@ -598,7 +598,7 @@ QString QSqlDriver::formatValue(const QSqlField &field, bool trimStrings) const
         {
             QString result = field.value().toString();
             if (trimStrings) {
-                int end = result.length();
+                int end = result.size();
                 while (end && result.at(end-1).isSpace()) /* skip white space from end */
                     end--;
                 result.truncate(end);
diff --git a/src/sql/kernel/qsqlrecord.cpp b/src/sql/kernel/qsqlrecord.cpp
index 41fcd745cd..74f42b2e48 100644
--- a/src/sql/kernel/qsqlrecord.cpp
+++ b/src/sql/kernel/qsqlrecord.cpp
@@ -18,7 +18,7 @@ public:
     QSqlRecordPrivate();
     QSqlRecordPrivate(const QSqlRecordPrivate &other);
 
-    inline bool contains(int index) { return index >= 0 && index < fields.count(); }
+    inline bool contains(int index) { return index >= 0 && index < fields.size(); }
     QString createField(int index, const QString &prefix) const;
 
     QList<QSqlField> fields;
@@ -337,7 +337,7 @@ bool QSqlRecord::contains(const QString& name) const
 void QSqlRecord::clearValues()
 {
     detach();
-    int count = d->fields.count();
+    int count = d->fields.size();
     for (int i = 0; i < count; ++i)
         d->fields[i].clear();
 }
@@ -451,7 +451,7 @@ bool QSqlRecord::isGenerated(int index) const
 
 int QSqlRecord::count() const
 {
-    return d->fields.count();
+    return d->fields.size();
 }
 
 /*!
diff --git a/src/sql/kernel/qsqlresult.cpp b/src/sql/kernel/qsqlresult.cpp
index b45f7b6790..56d5edb39f 100644
--- a/src/sql/kernel/qsqlresult.cpp
+++ b/src/sql/kernel/qsqlresult.cpp
@@ -639,13 +639,13 @@ bool QSqlResult::exec()
             else
                 f.setValue(val);
             query = query.replace(d->holders.at(i).holderPos,
-                                   holder.length(), driver()->formatValue(f));
+                                   holder.size(), driver()->formatValue(f));
         }
     } else {
         QString val;
         qsizetype i = 0;
         int idx = 0;
-        for (idx = 0; idx < d->values.count(); ++idx) {
+        for (idx = 0; idx < d->values.size(); ++idx) {
             i = query.indexOf(u'?', i);
             if (i == -1)
                 continue;
@@ -657,7 +657,7 @@ bool QSqlResult::exec()
                 f.setValue(var);
             val = driver()->formatValue(f);
             query = query.replace(i, 1, driver()->formatValue(f));
-            i += val.length();
+            i += val.size();
         }
     }
 
@@ -683,7 +683,7 @@ void QSqlResult::bindValue(int index, const QVariant& val, QSql::ParamType param
     QList<int> &indexes = d->indexes[d->fieldSerial(index)];
     if (!indexes.contains(index))
         indexes.append(index);
-    if (d->values.count() <= index)
+    if (d->values.size() <= index)
         d->values.resize(index + 1);
     d->values[index] = val;
     if (paramType != QSql::In || !d->types.isEmpty())
@@ -709,7 +709,7 @@ void QSqlResult::bindValue(const QString& placeholder, const QVariant& val,
     // bindings - don't reset it
     const QList<int> indexes = d->indexes.value(placeholder);
     for (int idx : indexes) {
-        if (d->values.count() <= idx)
+        if (d->values.size() <= idx)
             d->values.resize(idx + 1);
         d->values[idx] = val;
         if (paramType != QSql::In || !d->types.isEmpty())
@@ -789,7 +789,7 @@ QSql::ParamType QSqlResult::bindValueType(const QString& placeholder) const
 int QSqlResult::boundValueCount() const
 {
     Q_D(const QSqlResult);
-    return d->values.count();
+    return d->values.size();
 }
 
 /*!
@@ -949,10 +949,10 @@ bool QSqlResult::execBatch(bool arrayBind)
     Q_D(QSqlResult);
 
     QList<QVariant> values = d->values;
-    if (values.count() == 0)
+    if (values.size() == 0)
         return false;
-    for (int i = 0; i < values.at(0).toList().count(); ++i) {
-        for (int j = 0; j < values.count(); ++j)
+    for (int i = 0; i < values.at(0).toList().size(); ++i) {
+        for (int j = 0; j < values.size(); ++j)
             bindValue(j, values.at(j).toList().at(i), QSql::In);
         if (!exec())
             return false;
diff --git a/src/sql/models/qsqlquerymodel.cpp b/src/sql/models/qsqlquerymodel.cpp
index fee99bd8ea..0a7470d5c8 100644
--- a/src/sql/models/qsqlquerymodel.cpp
+++ b/src/sql/models/qsqlquerymodel.cpp
@@ -625,7 +625,7 @@ bool QSqlQueryModel::insertColumns(int column, int count, const QModelIndex &par
             d->colOffsets.append(nVal);
             Q_ASSERT(d->colOffsets.size() >= d->rec.count());
         }
-        for (int i = column + 1; i < d->colOffsets.count(); ++i)
+        for (int i = column + 1; i < d->colOffsets.size(); ++i)
             ++d->colOffsets[i];
     }
     endInsertColumns();
@@ -654,7 +654,7 @@ bool QSqlQueryModel::removeColumns(int column, int count, const QModelIndex &par
     int i;
     for (i = 0; i < count; ++i)
         d->rec.remove(column);
-    for (i = column; i < d->colOffsets.count(); ++i)
+    for (i = column; i < d->colOffsets.size(); ++i)
         d->colOffsets[i] -= count;
 
     endRemoveColumns();
diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp
index cb4c5df6c2..4a0d2fa9b3 100644
--- a/src/sql/models/qsqlrelationaltablemodel.cpp
+++ b/src/sql/models/qsqlrelationaltablemodel.cpp
@@ -253,7 +253,7 @@ public:
 
 void QSqlRelationalTableModelPrivate::clearChanges()
 {
-    for (int i = 0; i < relations.count(); ++i) {
+    for (int i = 0; i < relations.size(); ++i) {
         QRelation &rel = relations[i];
         rel.clear();
     }
@@ -277,7 +277,7 @@ int QSqlRelationalTableModelPrivate::nameToIndex(const QString &name) const
 
 void QSqlRelationalTableModelPrivate::clearCache()
 {
-    for (int i = 0; i < relations.count(); ++i)
+    for (int i = 0; i < relations.size(); ++i)
         relations[i].clearDictionary();
 
     QSqlTableModelPrivate::clearCache();
@@ -395,7 +395,7 @@ QVariant QSqlRelationalTableModel::data(const QModelIndex &index, int role) cons
 {
     Q_D(const QSqlRelationalTableModel);
 
-    if (role == Qt::DisplayRole && index.column() >= 0 && index.column() < d->relations.count() &&
+    if (role == Qt::DisplayRole && index.column() >= 0 && index.column() < d->relations.size() &&
             d->relations.value(index.column()).isValid()) {
         QRelation &relation = d->relations[index.column()];
         if (!relation.isDictionaryInitialized())
@@ -438,7 +438,7 @@ bool QSqlRelationalTableModel::setData(const QModelIndex &index, const QVariant
                                        int role)
 {
     Q_D(QSqlRelationalTableModel);
-    if ( role == Qt::EditRole && index.column() > 0 && index.column() < d->relations.count()
+    if ( role == Qt::EditRole && index.column() > 0 && index.column() < d->relations.size()
             && d->relations.value(index.column()).isValid()) {
         QRelation &relation = d->relations[index.column()];
         if (!relation.isDictionaryInitialized())
@@ -603,7 +603,7 @@ QString QSqlRelationalTableModel::selectStatement() const
 QSqlTableModel *QSqlRelationalTableModel::relationModel(int column) const
 {
     Q_D(const QSqlRelationalTableModel);
-    if (column < 0 || column >= d->relations.count())
+    if (column < 0 || column >= d->relations.size())
         return nullptr;
 
     QRelation &relation = const_cast<QSqlRelationalTableModelPrivate *>(d)->relations[column];
@@ -749,7 +749,7 @@ bool QSqlRelationalTableModel::removeColumns(int column, int count, const QModel
 
     for (int i = 0; i < count; ++i) {
         d->baseRec.remove(column);
-        if (d->relations.count() > column)
+        if (d->relations.size() > column)
             d->relations.remove(column);
     }
     return QSqlTableModel::removeColumns(column, count, parent);
diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp
index a6a8f68d20..6b832bd42d 100644
--- a/src/sql/models/qsqltablemodel.cpp
+++ b/src/sql/models/qsqltablemodel.cpp
@@ -32,7 +32,7 @@ QSqlTableModelPrivate::~QSqlTableModelPrivate()
 QSqlRecord QSqlTableModelPrivate::record(const QList<QVariant> &values) const
 {
     QSqlRecord r = rec;
-    for (int i = 0; i < r.count() && i < values.count(); ++i)
+    for (int i = 0; i < r.count() && i < values.size(); ++i)
         r.setValue(i, values.at(i));
     return r;
 }
@@ -381,7 +381,7 @@ bool QSqlTableModel::selectRow(int row)
                                               false);
     static const QString wh = Sql::where() + Sql::sp();
     if (d->filter.startsWith(wh, Qt::CaseInsensitive))
-        d->filter.remove(0, wh.length());
+        d->filter.remove(0, wh.size());
 
     QString stmt;