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/qmap.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/qmap.h')
| -rw-r--r-- | src/corelib/tools/qmap.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h index 3f46a8ad1e..3494bd0c4c 100644 --- a/src/corelib/tools/qmap.h +++ b/src/corelib/tools/qmap.h @@ -51,10 +51,7 @@ #include <QtCore/qdebug.h> #endif -#ifndef QT_NO_STL #include <map> -#endif - #include <new> QT_BEGIN_HEADER @@ -349,10 +346,8 @@ public: { qSwap(d, other.d); return *this; } #endif inline void swap(QMap<Key, T> &other) { qSwap(d, other.d); } -#ifndef QT_NO_STL explicit QMap(const typename std::map<Key, T> &other); std::map<Key, T> toStdMap() const; -#endif bool operator==(const QMap<Key, T> &other) const; inline bool operator!=(const QMap<Key, T> &other) const { return !(*this == other); } @@ -939,7 +934,6 @@ Q_OUTOFLINE_TEMPLATE bool QMap<Key, T>::operator==(const QMap<Key, T> &other) co return true; } -#ifndef QT_NO_STL template <class Key, class T> Q_OUTOFLINE_TEMPLATE QMap<Key, T>::QMap(const std::map<Key, T> &other) { @@ -963,8 +957,6 @@ Q_OUTOFLINE_TEMPLATE std::map<Key, T> QMap<Key, T>::toStdMap() const return map; } -#endif // QT_NO_STL - template <class Key, class T> class QMultiMap : public QMap<Key, T> { |