diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-05-27 09:58:12 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-06-20 20:01:33 +0200 |
commit | 03326a2fec416405b437089874f6439e937bbada (patch) | |
tree | 48d7137c3cd5e6f537e06e97380d3c1e76a56af9 /src/sql/kernel | |
parent | 1a9a4af388477efd9f7008d5c0bb74432c20279d (diff) |
Move implementation of QVector/List back to qlist.h
And name the main class QList. That's also the one we document.
This gives less porting pain for our users, and a lot less churn
in our API, as we use QList in Qt 5 in 95% of our API.
In addition, it gives more consistent naming with QStringList and
QByteArrayList and disambiguates QList vs QVector(2|3|4)D.
Fixes: QTBUG-84468
Change-Id: I3cba9d1d3179969d8bf9320b31be2230d021d1a9
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/sql/kernel')
-rw-r--r-- | src/sql/kernel/qsqlcachedresult_p.h | 2 | ||||
-rw-r--r-- | src/sql/kernel/qsqlresult.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/sql/kernel/qsqlcachedresult_p.h b/src/sql/kernel/qsqlcachedresult_p.h index 1bca1fd090..0b9dfd3e9a 100644 --- a/src/sql/kernel/qsqlcachedresult_p.h +++ b/src/sql/kernel/qsqlcachedresult_p.h @@ -54,11 +54,11 @@ #include <QtSql/private/qtsqlglobal_p.h> #include "QtSql/qsqlresult.h" #include "QtSql/private/qsqlresult_p.h" +#include <QtCore/qcontainerfwd.h> QT_BEGIN_NAMESPACE class QVariant; -template <typename T> class QVector; class QSqlCachedResultPrivate; diff --git a/src/sql/kernel/qsqlresult.h b/src/sql/kernel/qsqlresult.h index 43d53d4027..a7fdae834a 100644 --- a/src/sql/kernel/qsqlresult.h +++ b/src/sql/kernel/qsqlresult.h @@ -42,6 +42,7 @@ #include <QtSql/qtsqlglobal.h> #include <QtCore/qvariant.h> +#include <QtCore/qcontainerfwd.h> // for testing: class tst_QSqlQuery; @@ -51,7 +52,7 @@ QT_BEGIN_NAMESPACE class QString; class QSqlRecord; -template <typename T> class QVector; +class QVariant; class QSqlDriver; class QSqlError; class QSqlResultPrivate; |