From 6f51fee995cf6f4a746077209f4dbb729c463769 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 26 Mar 2012 15:28:40 -0300 Subject: Remove references to QT_NO_STL from QtCore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/corelib/global/qglobal.h | 8 -------- src/corelib/global/qtypeinfo.h | 4 ---- 2 files changed, 12 deletions(-) (limited to 'src/corelib/global') diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 22f65a6aba..ec7de3b1c5 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -69,9 +69,7 @@ #ifdef __cplusplus -#ifndef QT_NO_STL #include -#endif #ifndef QT_NAMESPACE /* user namespace */ @@ -1183,14 +1181,8 @@ static inline bool qIsNull(float f) template inline void qSwap(T &value1, T &value2) { -#ifdef QT_NO_STL - const T t = value1; - value1 = value2; - value2 = t; -#else using std::swap; swap(value1, value2); -#endif } #if QT_DEPRECATED_SINCE(5, 0) diff --git a/src/corelib/global/qtypeinfo.h b/src/corelib/global/qtypeinfo.h index 1c08bbe1cf..48ee99ef27 100644 --- a/src/corelib/global/qtypeinfo.h +++ b/src/corelib/global/qtypeinfo.h @@ -172,9 +172,6 @@ Q_DECLARE_TYPEINFO_BODY(QFlags, Q_PRIMITIVE_TYPE); types must declare a 'bool isDetached(void) const;' member for this to work. */ -#ifdef QT_NO_STL -#define Q_DECLARE_SHARED_STL(TYPE) -#else #define Q_DECLARE_SHARED_STL(TYPE) \ QT_END_NAMESPACE \ namespace std { \ @@ -182,7 +179,6 @@ namespace std { \ { swap(value1.data_ptr(), value2.data_ptr()); } \ } \ QT_BEGIN_NAMESPACE -#endif #define Q_DECLARE_SHARED(TYPE) \ template <> inline void qSwap(TYPE &value1, TYPE &value2) \ -- cgit v1.2.3