From 5c3b16706ff30c38258df0e98e071bf8ae6a1460 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@qt.io>
Date: Mon, 8 Aug 2016 09:05:53 +0200
Subject: Remove compiler-specific implementations of Q_IS_ENUM

Since the macro is now just a wrapper for std::is_enum,
its use is also deprecated.

[ChangeLog][QtCore][Global] Q_IS_ENUM is deprecated.
Use std::is_enum<>::value instead.

Change-Id: I09b9f4559c02c81f338cace927873318f2acafde
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 tests/auto/corelib/global/qglobal/tst_qglobal.cpp  | 95 ----------------------
 .../corelib/kernel/qmetatype/tst_qmetatype.cpp     |  2 +-
 2 files changed, 1 insertion(+), 96 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
index ff0497b69e..bb6ec1c8e7 100644
--- a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
+++ b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
@@ -48,7 +48,6 @@ private slots:
     void qConstructorFunction();
     void qCoreAppStartupFunction();
     void qCoreAppStartupFunctionRestart();
-    void isEnum();
     void qAlignOf();
     void integerForSize();
     void qprintable();
@@ -365,100 +364,6 @@ public:
     enum AnEnum {};
 };
 
-#if defined (Q_COMPILER_CLASS_ENUM)
-enum class isEnum_G : qint64 {};
-#endif
-
-void tst_QGlobal::isEnum()
-{
-#if defined (Q_CC_MSVC)
-#define IS_ENUM_TRUE(x)     (Q_IS_ENUM(x) == true)
-#define IS_ENUM_FALSE(x)    (Q_IS_ENUM(x) == false)
-#else
-#define IS_ENUM_TRUE(x)     (Q_IS_ENUM(x) == true && std::is_enum<x>::value == true)
-#define IS_ENUM_FALSE(x)    (Q_IS_ENUM(x) == false && std::is_enum<x>::value == false)
-#endif
-
-    QVERIFY(IS_ENUM_TRUE(isEnum_B_Byte));
-    QVERIFY(IS_ENUM_TRUE(const isEnum_B_Byte));
-    QVERIFY(IS_ENUM_TRUE(volatile isEnum_B_Byte));
-    QVERIFY(IS_ENUM_TRUE(const volatile isEnum_B_Byte));
-
-    QVERIFY(IS_ENUM_TRUE(isEnum_B_Short));
-    QVERIFY(IS_ENUM_TRUE(const isEnum_B_Short));
-    QVERIFY(IS_ENUM_TRUE(volatile isEnum_B_Short));
-    QVERIFY(IS_ENUM_TRUE(const volatile isEnum_B_Short));
-
-    QVERIFY(IS_ENUM_TRUE(isEnum_B_Int));
-    QVERIFY(IS_ENUM_TRUE(const isEnum_B_Int));
-    QVERIFY(IS_ENUM_TRUE(volatile isEnum_B_Int));
-    QVERIFY(IS_ENUM_TRUE(const volatile isEnum_B_Int));
-
-    QVERIFY(IS_ENUM_TRUE(isEnum_F::AnEnum));
-    QVERIFY(IS_ENUM_TRUE(const isEnum_F::AnEnum));
-    QVERIFY(IS_ENUM_TRUE(volatile isEnum_F::AnEnum));
-    QVERIFY(IS_ENUM_TRUE(const volatile isEnum_F::AnEnum));
-
-    QVERIFY(IS_ENUM_FALSE(void));
-    QVERIFY(IS_ENUM_FALSE(isEnum_B_Byte &));
-    QVERIFY(IS_ENUM_FALSE(isEnum_B_Byte[1]));
-    QVERIFY(IS_ENUM_FALSE(const isEnum_B_Byte[1]));
-    QVERIFY(IS_ENUM_FALSE(isEnum_B_Byte[]));
-    QVERIFY(IS_ENUM_FALSE(int));
-    QVERIFY(IS_ENUM_FALSE(float));
-    QVERIFY(IS_ENUM_FALSE(isEnum_A));
-    QVERIFY(IS_ENUM_FALSE(isEnum_A *));
-    QVERIFY(IS_ENUM_FALSE(const isEnum_A));
-    QVERIFY(IS_ENUM_FALSE(isEnum_C));
-    QVERIFY(IS_ENUM_FALSE(isEnum_D));
-    QVERIFY(IS_ENUM_FALSE(isEnum_E));
-    QVERIFY(IS_ENUM_FALSE(void()));
-    QVERIFY(IS_ENUM_FALSE(void(*)()));
-    QVERIFY(IS_ENUM_FALSE(int isEnum_A::*));
-    QVERIFY(IS_ENUM_FALSE(void (isEnum_A::*)()));
-
-    QVERIFY(IS_ENUM_FALSE(size_t));
-    QVERIFY(IS_ENUM_FALSE(bool));
-    QVERIFY(IS_ENUM_FALSE(wchar_t));
-
-    QVERIFY(IS_ENUM_FALSE(char));
-    QVERIFY(IS_ENUM_FALSE(unsigned char));
-    QVERIFY(IS_ENUM_FALSE(short));
-    QVERIFY(IS_ENUM_FALSE(unsigned short));
-    QVERIFY(IS_ENUM_FALSE(int));
-    QVERIFY(IS_ENUM_FALSE(unsigned int));
-    QVERIFY(IS_ENUM_FALSE(long));
-    QVERIFY(IS_ENUM_FALSE(unsigned long));
-
-    QVERIFY(IS_ENUM_FALSE(qint8));
-    QVERIFY(IS_ENUM_FALSE(quint8));
-    QVERIFY(IS_ENUM_FALSE(qint16));
-    QVERIFY(IS_ENUM_FALSE(quint16));
-    QVERIFY(IS_ENUM_FALSE(qint32));
-    QVERIFY(IS_ENUM_FALSE(quint32));
-    QVERIFY(IS_ENUM_FALSE(qint64));
-    QVERIFY(IS_ENUM_FALSE(quint64));
-
-    QVERIFY(IS_ENUM_FALSE(void *));
-    QVERIFY(IS_ENUM_FALSE(int *));
-
-#if defined (Q_COMPILER_UNICODE_STRINGS)
-    QVERIFY(IS_ENUM_FALSE(char16_t));
-    QVERIFY(IS_ENUM_FALSE(char32_t));
-#endif
-
-#if defined (Q_COMPILER_CLASS_ENUM)
-    // Strongly type class enums are not handled by the
-    // fallback type traits implementation. Any compiler
-    // supported by Qt that supports C++0x class enums
-    // should also support the __is_enum intrinsic.
-    QVERIFY(Q_IS_ENUM(isEnum_G));
-#endif
-
-#undef IS_ENUM_TRUE
-#undef IS_ENUM_FALSE
-}
-
 struct Empty {};
 template <class T> struct AlignmentInStruct { T dummy; };
 
diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
index caceda86be..7d9f56ef38 100644
--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
@@ -712,7 +712,7 @@ void tst_QMetaType::flags_data()
         << bool(!QTypeInfo<RealType>::isStatic) \
         << bool(QTypeInfo<RealType>::isComplex) \
         << bool(QtPrivate::IsPointerToTypeDerivedFromQObject<RealType>::Value) \
-        << bool(Q_IS_ENUM(RealType));
+        << bool(std::is_enum<RealType>::value);
 QT_FOR_EACH_STATIC_CORE_CLASS(ADD_METATYPE_TEST_ROW)
 QT_FOR_EACH_STATIC_PRIMITIVE_POINTER(ADD_METATYPE_TEST_ROW)
 QT_FOR_EACH_STATIC_CORE_POINTER(ADD_METATYPE_TEST_ROW)
-- 
cgit v1.2.3