Use QList instead of QVector in sql

Task-number: QTBUG-84469
Change-Id: I942aec7d949331a52d7f12fa2725d8d9707f605f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

6 files changed, 12 insertions, 12 deletions

diff --git a/src/sql/kernel/qsqlcachedresult_p.h b/src/sql/kernel/qsqlcachedresult_p.h
index 0b9dfd3e9a..fbebd10284 100644
--- a/src/sql/kernel/qsqlcachedresult_p.h
+++ b/src/sql/kernel/qsqlcachedresult_p.h
@@ -67,7 +67,7 @@ class Q_SQL_EXPORT QSqlCachedResult: public QSqlResult
     Q_DECLARE_PRIVATE(QSqlCachedResult)
 
 public:
-    typedef QVector<QVariant> ValueCache;
+    typedef QList<QVariant> ValueCache;
 
 protected:
     QSqlCachedResult(QSqlCachedResultPrivate &d);
diff --git a/src/sql/kernel/qsqlindex.h b/src/sql/kernel/qsqlindex.h
index 6373b77031..b704cef685 100644
--- a/src/sql/kernel/qsqlindex.h
+++ b/src/sql/kernel/qsqlindex.h
@@ -70,7 +70,7 @@ private:
     QString createField(int i, const QString& prefix, bool verbose) const;
     QString cursor;
     QString nm;
-    QVector<bool> sorts;
+    QList<bool> sorts;
 };
 
 QT_END_NAMESPACE
diff --git a/src/sql/kernel/qsqlrecord.cpp b/src/sql/kernel/qsqlrecord.cpp
index 1c3e03fecf..0afeafe416 100644
--- a/src/sql/kernel/qsqlrecord.cpp
+++ b/src/sql/kernel/qsqlrecord.cpp
@@ -57,7 +57,7 @@ public:
     inline bool contains(int index) { return index >= 0 && index < fields.count(); }
     QString createField(int index, const QString &prefix) const;
 
-    QVector<QSqlField> fields;
+    QList<QSqlField> fields;
     QAtomicInt ref;
 };
 
diff --git a/src/sql/kernel/qsqlresult.cpp b/src/sql/kernel/qsqlresult.cpp
index ecff0a7f2d..067afd9448 100644
--- a/src/sql/kernel/qsqlresult.cpp
+++ b/src/sql/kernel/qsqlresult.cpp
@@ -675,7 +675,7 @@ void QSqlResult::bindValue(int index, const QVariant& val, QSql::ParamType param
 {
     Q_D(QSqlResult);
     d->binds = PositionalBinding;
-    QVector<int> &indexes = d->indexes[d->fieldSerial(index)];
+    QList<int> &indexes = d->indexes[d->fieldSerial(index)];
     if (!indexes.contains(index))
         indexes.append(index);
     if (d->values.count() <= index)
@@ -702,7 +702,7 @@ void QSqlResult::bindValue(const QString& placeholder, const QVariant& val,
     d->binds = NamedBinding;
     // if the index has already been set when doing emulated named
     // bindings - don't reset it
-    const QVector<int> indexes = d->indexes.value(placeholder);
+    const QList<int> indexes = d->indexes.value(placeholder);
     for (int idx : indexes) {
         if (d->values.count() <= idx)
             d->values.resize(idx + 1);
@@ -749,7 +749,7 @@ QVariant QSqlResult::boundValue(int index) const
 QVariant QSqlResult::boundValue(const QString& placeholder) const
 {
     Q_D(const QSqlResult);
-    const QVector<int> indexes = d->indexes.value(placeholder);
+    const QList<int> indexes = d->indexes.value(placeholder);
     return d->values.value(indexes.value(0,-1));
 }
 
@@ -793,7 +793,7 @@ int QSqlResult::boundValueCount() const
 
     \sa boundValueCount()
 */
-QVector<QVariant>& QSqlResult::boundValues() const
+QList<QVariant> &QSqlResult::boundValues() const
 {
     Q_D(const QSqlResult);
     return const_cast<QSqlResultPrivate *>(d)->values;
@@ -943,7 +943,7 @@ bool QSqlResult::execBatch(bool arrayBind)
     Q_UNUSED(arrayBind);
     Q_D(QSqlResult);
 
-    QVector<QVariant> values = d->values;
+    QList<QVariant> values = d->values;
     if (values.count() == 0)
         return false;
     for (int i = 0; i < values.at(0).toList().count(); ++i) {
diff --git a/src/sql/kernel/qsqlresult.h b/src/sql/kernel/qsqlresult.h
index a7fdae834a..862022c889 100644
--- a/src/sql/kernel/qsqlresult.h
+++ b/src/sql/kernel/qsqlresult.h
@@ -105,7 +105,7 @@ protected:
     QSql::ParamType bindValueType(const QString& placeholder) const;
     QSql::ParamType bindValueType(int pos) const;
     int boundValueCount() const;
-    QVector<QVariant>& boundValues() const;
+    QList<QVariant> &boundValues() const;
     QString executedQuery() const;
     QString boundValueName(int pos) const;
     void clear();
diff --git a/src/sql/kernel/qsqlresult_p.h b/src/sql/kernel/qsqlresult_p.h
index 3b9697046d..672f3ac59b 100644
--- a/src/sql/kernel/qsqlresult_p.h
+++ b/src/sql/kernel/qsqlresult_p.h
@@ -119,11 +119,11 @@ public:
 
     QString executedQuery;
     QHash<int, QSql::ParamType> types;
-    QVector<QVariant> values;
-    using IndexMap = QHash<QString, QVector<int> >;
+    QList<QVariant> values;
+    using IndexMap = QHash<QString, QList<int>>;
     IndexMap indexes;
 
-    using QHolderVector = QVector<QHolder>;
+    using QHolderVector = QList<QHolder>;
     QHolderVector holders;
 
     QSqlResult::BindingSyntax binds = QSqlResult::PositionalBinding;