diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2012-11-01 23:14:05 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-09 23:04:48 +0200 |
| commit | a23f5697a1f1fea970d665ca6c0671feecd21d6a (patch) | |
| tree | 707ada07f144bd107a8abaa45e6a9d303aba276f | |
| parent | a1898f4466518bf3e1b6e9154eec05ecf9d909e3 (diff) | |
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 <ogoffart@woboq.com>
| -rw-r--r-- | src/corelib/tools/qlist.h | 7 |
1 files 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 <iterator> #include <list> +#include <algorithm> #ifdef Q_COMPILER_INITIALIZER_LISTS #include <initializer_list> #endif @@ -123,7 +124,7 @@ public: #ifdef Q_COMPILER_INITIALIZER_LISTS inline QList(std::initializer_list<T> args) : d(const_cast<QListData::Data *>(&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<T> &l) const; inline bool operator!=(const QList<T> &l) const { return !(*this == l); } @@ -332,9 +333,9 @@ public: static QList<T> fromSet(const QSet<T> &set); static inline QList<T> fromStdList(const std::list<T> &list) - { QList<T> tmp; qCopy(list.begin(), list.end(), std::back_inserter(tmp)); return tmp; } + { QList<T> tmp; std::copy(list.begin(), list.end(), std::back_inserter(tmp)); return tmp; } inline std::list<T> toStdList() const - { std::list<T> tmp; qCopy(constBegin(), constEnd(), std::back_inserter(tmp)); return tmp; } + { std::list<T> tmp; std::copy(constBegin(), constEnd(), std::back_inserter(tmp)); return tmp; } private: Node *detach_helper_grow(int i, int n); |