1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove qCopy usages from QList

Browse Source 
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>
This commit is contained in:
Giuseppe D'Angelo 2012-11-01 23:14:05 +01:00 committed by The Qt Project
parent a1898f4466
commit a23f5697a1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/tools/qlist.h
View File

@ -48,6 +48,7 @@
#include <iterator> #include <iterator>
#include <list> #include <list>
#include <algorithm>
#ifdef Q_COMPILER_INITIALIZER_LISTS #ifdef Q_COMPILER_INITIALIZER_LISTS
#include <initializer_list> #include <initializer_list>
#endif #endif
@ -123,7 +124,7 @@ public:
#ifdef Q_COMPILER_INITIALIZER_LISTS #ifdef Q_COMPILER_INITIALIZER_LISTS
inline QList(std::initializer_list<T> args) inline QList(std::initializer_list<T> args)
: d(const_cast<QListData::Data *>(&QListData::shared_null)) : 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 #endif
bool operator==(const QList<T> &l) const; bool operator==(const QList<T> &l) const;
inline bool operator!=(const QList<T> &l) const { return !(*this == l); } 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 QList<T> fromSet(const QSet<T> &set);
static inline QList<T> fromStdList(const std::list<T> &list) 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 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: private:
Node *detach_helper_grow(int i, int n); Node *detach_helper_grow(int i, int n);