diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-09-03 22:11:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-11 10:30:23 +0200 |
| commit | 8c4323c74d6cf6ba5a646936c912191e93939555 (patch) | |
| tree | c0e981d1614b63c74fe17e13f4ff5ecb07e4dee4 /src/corelib/tools | |
| parent | ec846146b443bfb75a86023e2235ab7851dfd67c (diff) | |
Remove qCopy from QLinkedList / QVector
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I5f7c2a6b3588a07113061c018e2870f476bea5a7
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qlinkedlist.h | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qvector.h | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/corelib/tools/qlinkedlist.h b/src/corelib/tools/qlinkedlist.h index 28386c632c..56ff2da16d 100644 --- a/src/corelib/tools/qlinkedlist.h +++ b/src/corelib/tools/qlinkedlist.h @@ -221,9 +221,9 @@ public: typedef qptrdiff difference_type; static inline QLinkedList<T> fromStdList(const std::list<T> &list) - { QLinkedList<T> tmp; qCopy(list.begin(), list.end(), std::back_inserter(tmp)); return tmp; } + { QLinkedList<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; } // comfort QLinkedList<T> &operator+=(const QLinkedList<T> &l); diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index 0f2acd6986..caa291b3d9 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -56,6 +56,8 @@ #include <initializer_list> #endif +#include <algorithm> + QT_BEGIN_NAMESPACE class QRegion; @@ -227,9 +229,9 @@ public: static QVector<T> fromList(const QList<T> &list); static inline QVector<T> fromStdVector(const std::vector<T> &vector) - { QVector<T> tmp; tmp.reserve(int(vector.size())); qCopy(vector.begin(), vector.end(), std::back_inserter(tmp)); return tmp; } + { QVector<T> tmp; tmp.reserve(int(vector.size())); std::copy(vector.begin(), vector.end(), std::back_inserter(tmp)); return tmp; } inline std::vector<T> toStdVector() const - { std::vector<T> tmp; tmp.reserve(size()); qCopy(constBegin(), constEnd(), std::back_inserter(tmp)); return tmp; } + { std::vector<T> tmp; tmp.reserve(size()); std::copy(constBegin(), constEnd(), std::back_inserter(tmp)); return tmp; } private: friend class QRegion; // Optimization for QRegion::rects() |