diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2019-05-03 11:53:18 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2019-05-05 17:34:43 +0000 |
| commit | 82ddecfb17158c35de1d0740dd7ecd5562d41726 (patch) | |
| tree | 42fb0ecc0760cf4d98542d41cd2899d6edcab71f /src/corelib/tools/qlist.h | |
| parent | b5547e49cd1760ba5d100dcc720e6366cbd23f06 (diff) | |
Deprecate {to,from}Std{List,Vector}
ask our users to use the range constructors instead. This will allow
us to remove the include dependency towards <list> and <vector> in
Qt 6.
Change-Id: Id90f2058432e19941de1fa847100a7920432ad71
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qlist.h')
| -rw-r--r-- | src/corelib/tools/qlist.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h index 27868f7313..513d7eafe1 100644 --- a/src/corelib/tools/qlist.h +++ b/src/corelib/tools/qlist.h @@ -51,7 +51,9 @@ #include <algorithm> #include <initializer_list> #include <iterator> +#if QT_VERSION < QT_VERSION_CHECK(6,0,0) #include <list> +#endif #include <stdlib.h> #include <new> @@ -403,10 +405,14 @@ public: static QList<T> fromVector(const QVector<T> &vector); static QList<T> fromSet(const QSet<T> &set); +#if QT_VERSION < QT_VERSION_CHECK(6,0,0) + Q_DECL_DEPRECATED_X("Use QList<T>(list.begin(), list.end()) instead.") static inline QList<T> fromStdList(const std::list<T> &list) { QList<T> tmp; std::copy(list.begin(), list.end(), std::back_inserter(tmp)); return tmp; } + Q_DECL_DEPRECATED_X("Use std::list<T>(list.begin(), list.end()) instead.") inline std::list<T> toStdList() const { std::list<T> tmp; std::copy(constBegin(), constEnd(), std::back_inserter(tmp)); return tmp; } +#endif private: Node *detach_helper_grow(int i, int n); |