diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-11 11:16:42 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-11 11:16:42 +0200 |
commit | ae97d11589dd03edeea0475163e6110869143b35 (patch) | |
tree | 15f79917b0e303445976028cb541668a1ebb67f1 /src/corelib/tools/qlist.h | |
parent | 6e42979518aa0697ff31706616ddbc05486f1864 (diff) | |
parent | 4e875d988e99df57c439f481e258e2138fdb9410 (diff) |
Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"
Diffstat (limited to 'src/corelib/tools/qlist.h')
-rw-r--r-- | src/corelib/tools/qlist.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h index 04c1f12f5f..70bbc11ad2 100644 --- a/src/corelib/tools/qlist.h +++ b/src/corelib/tools/qlist.h @@ -414,10 +414,10 @@ public: 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; } + { return QList<T>(list.begin(), list.end()); } 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; } + { return std::list<T>(begin(), end()); } #endif private: @@ -1105,10 +1105,7 @@ inline int QList<T>::count_impl(const T &t, QListData::ArrayCompatibleLayout) co template <typename T> Q_OUTOFLINE_TEMPLATE QVector<T> QList<T>::toVector() const { - QVector<T> result(size()); - for (int i = 0; i < size(); ++i) - result[i] = at(i); - return result; + return QVector<T>(begin(), end()); } template <typename T> @@ -1120,11 +1117,7 @@ QList<T> QList<T>::fromVector(const QVector<T> &vector) template <typename T> Q_OUTOFLINE_TEMPLATE QList<T> QVector<T>::toList() const { - QList<T> result; - result.reserve(size()); - for (int i = 0; i < size(); ++i) - result.append(at(i)); - return result; + return QList<T>(begin(), end()); } template <typename T> |