From 64c3ca091026de433780ba05f006294968f78526 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 22 Jun 2020 12:47:00 +0200 Subject: Use QList instead of QVector in sql Task-number: QTBUG-84469 Change-Id: I942aec7d949331a52d7f12fa2725d8d9707f605f Reviewed-by: Lars Knoll --- src/sql/kernel/qsqlcachedresult_p.h | 2 +- src/sql/kernel/qsqlindex.h | 2 +- src/sql/kernel/qsqlrecord.cpp | 2 +- src/sql/kernel/qsqlresult.cpp | 10 +++++----- src/sql/kernel/qsqlresult.h | 2 +- src/sql/kernel/qsqlresult_p.h | 6 +++--- src/sql/models/qsqlquerymodel_p.h | 2 +- src/sql/models/qsqlrelationaltablemodel.cpp | 2 +- src/sql/models/qsqltablemodel.cpp | 2 +- src/sql/models/qsqltablemodel_p.h | 2 +- 10 files changed, 16 insertions(+), 16 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 ValueCache; + typedef QList 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 sorts; + QList 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 fields; + QList 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 &indexes = d->indexes[d->fieldSerial(index)]; + QList &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 indexes = d->indexes.value(placeholder); + const QList 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 indexes = d->indexes.value(placeholder); + const QList indexes = d->indexes.value(placeholder); return d->values.value(indexes.value(0,-1)); } @@ -793,7 +793,7 @@ int QSqlResult::boundValueCount() const \sa boundValueCount() */ -QVector& QSqlResult::boundValues() const +QList &QSqlResult::boundValues() const { Q_D(const QSqlResult); return const_cast(d)->values; @@ -943,7 +943,7 @@ bool QSqlResult::execBatch(bool arrayBind) Q_UNUSED(arrayBind); Q_D(QSqlResult); - QVector values = d->values; + QList 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& boundValues() const; + QList &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 types; - QVector values; - using IndexMap = QHash >; + QList values; + using IndexMap = QHash>; IndexMap indexes; - using QHolderVector = QVector; + using QHolderVector = QList; QHolderVector holders; QSqlResult::BindingSyntax binds = QSqlResult::PositionalBinding; diff --git a/src/sql/models/qsqlquerymodel_p.h b/src/sql/models/qsqlquerymodel_p.h index 64e9aeb3db..abacd64cde 100644 --- a/src/sql/models/qsqlquerymodel_p.h +++ b/src/sql/models/qsqlquerymodel_p.h @@ -80,7 +80,7 @@ public: QModelIndex bottom; QSqlRecord rec; uint atEnd : 1; - QVector > headers; + QList> headers; QVarLengthArray colOffsets; // used to calculate indexInQuery of columns int nestedResetLevel; }; diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp index 4f5f00bf96..bdd82990d9 100644 --- a/src/sql/models/qsqlrelationaltablemodel.cpp +++ b/src/sql/models/qsqlrelationaltablemodel.cpp @@ -275,7 +275,7 @@ public: QString fullyQualifiedFieldName(const QString &tableName, const QString &fieldName) const; int nameToIndex(const QString &name) const override; - mutable QVector relations; + mutable QList relations; QSqlRecord baseRec; // the record without relations void clearChanges(); void clearCache() override; diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp index 30a27bada8..cb5026eb79 100644 --- a/src/sql/models/qsqltablemodel.cpp +++ b/src/sql/models/qsqltablemodel.cpp @@ -63,7 +63,7 @@ QSqlTableModelPrivate::~QSqlTableModelPrivate() /*! \internal Populates our record with values. */ -QSqlRecord QSqlTableModelPrivate::record(const QVector &values) const +QSqlRecord QSqlTableModelPrivate::record(const QList &values) const { QSqlRecord r = rec; for (int i = 0; i < r.count() && i < values.count(); ++i) diff --git a/src/sql/models/qsqltablemodel_p.h b/src/sql/models/qsqltablemodel_p.h index 9ac34e7259..d585f71548 100644 --- a/src/sql/models/qsqltablemodel_p.h +++ b/src/sql/models/qsqltablemodel_p.h @@ -75,7 +75,7 @@ public: void clear(); virtual void clearCache(); - QSqlRecord record(const QVector &values) const; + QSqlRecord record(const QList &values) const; bool exec(const QString &stmt, bool prepStatement, const QSqlRecord &rec, const QSqlRecord &whereValues); -- cgit v1.2.3