From a23f5697a1f1fea970d665ca6c0671feecd21d6a Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Thu, 1 Nov 2012 23:14:05 +0100 Subject: Remove qCopy usages from QList QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: Ib667321884b2f06de6f440f2b8e329361f926ce1 Reviewed-by: Olivier Goffart --- src/corelib/tools/qlist.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h index c81968dce1..b795bbc86e 100644 --- a/src/corelib/tools/qlist.h +++ b/src/corelib/tools/qlist.h @@ -48,6 +48,7 @@ #include #include +#include #ifdef Q_COMPILER_INITIALIZER_LISTS #include #endif @@ -123,7 +124,7 @@ public: #ifdef Q_COMPILER_INITIALIZER_LISTS inline QList(std::initializer_list args) : d(const_cast(&QListData::shared_null)) - { qCopy(args.begin(), args.end(), std::back_inserter(*this)); } + { std::copy(args.begin(), args.end(), std::back_inserter(*this)); } #endif bool operator==(const QList &l) const; inline bool operator!=(const QList &l) const { return !(*this == l); } @@ -332,9 +333,9 @@ public: static QList fromSet(const QSet &set); static inline QList fromStdList(const std::list &list) - { QList tmp; qCopy(list.begin(), list.end(), std::back_inserter(tmp)); return tmp; } + { QList tmp; std::copy(list.begin(), list.end(), std::back_inserter(tmp)); return tmp; } inline std::list toStdList() const - { std::list tmp; qCopy(constBegin(), constEnd(), std::back_inserter(tmp)); return tmp; } + { std::list tmp; std::copy(constBegin(), constEnd(), std::back_inserter(tmp)); return tmp; } private: Node *detach_helper_grow(int i, int n); -- cgit v1.2.3