From 5357231c0a10eef558cc6aebfd172048dc010a96 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 24 May 2019 14:27:48 +0200 Subject: Make QList an alias to QVector This is almost 100% source compatible with Qt 5. Exceptions are * Stability of references for large or non movable types * taking a PMF for types that are now overloaded with r-value references in QVector * The missing prepend optimization in QVector (that is still planned to come for Qt 6) Change-Id: I96d44553304dd623def9c70d6fea8fa2fb0373b0 Reviewed-by: Simon Hausmann --- src/corelib/tools/qvector.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/corelib/tools/qvector.h') diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index 45f7c5b76b..366eb15813 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -317,9 +317,6 @@ public: inline QVector &operator<<(T &&t) { append(std::move(t)); return *this; } - static QVector fromList(const QList &list); - QList toList() const; - #if QT_VERSION < QT_VERSION_CHECK(6,0,0) Q_DECL_DEPRECATED_X("Use QVector(vector.begin(), vector.end()) instead.") static inline QVector fromStdVector(const std::vector &vector) @@ -328,6 +325,14 @@ public: inline std::vector toStdVector() const { return std::vector(d->begin(), d->end()); } #endif + + // Consider deprecating in 6.4 or later + static QVector fromList(const QVector &list) { return list; } + QVector toList() const { return *this; } + + static inline QVector fromVector(const QVector &vector) { return vector; } + inline QVector toVector() const { return *this; } + private: // ### Qt6: remove methods, they are unused void reallocData(const int size, const int alloc, QArrayData::AllocationOptions options = QArrayData::Default); -- cgit v1.2.3