diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-03-26 15:28:40 -0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-07 05:19:42 +0200 |
| commit | 6f51fee995cf6f4a746077209f4dbb729c463769 (patch) | |
| tree | 573a0868cbf18b0c2c6bc9bb3d2d034a6a95b4c8 /src/corelib/tools/qlinkedlist.h | |
| parent | 1241a02a01183541ed4e3a3367e275c9094f84a1 (diff) | |
Remove references to QT_NO_STL from QtCore
QT_NO_STL is now no longer defined, so remove the conditionals and
select the STL side.
Change-Id: Ieedd248ae16e5a128b4ac287f850b3ebc8fb6181
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src/corelib/tools/qlinkedlist.h')
| -rw-r--r-- | src/corelib/tools/qlinkedlist.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/tools/qlinkedlist.h b/src/corelib/tools/qlinkedlist.h index 27d0ffe875..a8a97b308a 100644 --- a/src/corelib/tools/qlinkedlist.h +++ b/src/corelib/tools/qlinkedlist.h @@ -45,10 +45,8 @@ #include <QtCore/qiterator.h> #include <QtCore/qrefcount.h> -#ifndef QT_NO_STL #include <iterator> #include <list> -#endif QT_BEGIN_HEADER @@ -221,12 +219,10 @@ public: typedef const value_type &const_reference; typedef qptrdiff difference_type; -#ifndef QT_NO_STL static inline QLinkedList<T> fromStdList(const std::list<T> &list) { QLinkedList<T> tmp; qCopy(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; } -#endif // comfort QLinkedList<T> &operator+=(const QLinkedList<T> &l); |