From 615270a3008cfc1314a3c983b7e69006dc4184b4 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@qt.io>
Date: Mon, 8 Aug 2016 09:41:57 +0200
Subject: Rename QtPrivate::is_[un]signed to QtPrivate::Is[Un]signedEnum

Any other use than for enums should use std::is_[un]signed. Make this
explicit by renaming the type traits.

Change-Id: I494158563c95c710e710d0d337f4e547006df171
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/global/qflags.h      |  2 +-
 src/corelib/global/qtypetraits.h | 41 ++++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/corelib/global/qflags.h b/src/corelib/global/qflags.h
index f85fc705b4..b871c90c9d 100644
--- a/src/corelib/global/qflags.h
+++ b/src/corelib/global/qflags.h
@@ -103,7 +103,7 @@ public:
     typedef int Int;
 #else
     typedef typename std::conditional<
-            QtPrivate::is_unsigned<Enum>::value,
+            QtPrivate::QIsUnsignedEnum<Enum>::value,
             unsigned int,
             signed int
         >::type Int;
diff --git a/src/corelib/global/qtypetraits.h b/src/corelib/global/qtypetraits.h
index b664dd3a3e..9773db919b 100644
--- a/src/corelib/global/qtypetraits.h
+++ b/src/corelib/global/qtypetraits.h
@@ -47,7 +47,8 @@ QT_BEGIN_NAMESPACE
 namespace QtPrivate {
 
 //
-// define custom is_signed, is_unsigned that also works with enum's
+// Define QIsUnsignedEnum, QIsSignedEnum -
+// std::is_signed, std::is_unsigned does not work for enum's
 //
 
 // a metafunction to invert an integral_constant:
@@ -57,37 +58,37 @@ struct not_
 
 // Checks whether a type is unsigned (T must be convertible to unsigned int):
 template <typename T>
-struct is_unsigned
+struct QIsUnsignedEnum
     : std::integral_constant<bool, (T(0) < T(-1))> {};
 
 // Checks whether a type is signed (T must be convertible to int):
 template <typename T>
-struct is_signed
-    : not_< is_unsigned<T> > {};
+struct QIsSignedEnum
+    : not_< QIsUnsignedEnum<T> > {};
 
-Q_STATIC_ASSERT(( is_unsigned<quint8>::value));
-Q_STATIC_ASSERT((!is_unsigned<qint8>::value));
+Q_STATIC_ASSERT(( QIsUnsignedEnum<quint8>::value));
+Q_STATIC_ASSERT((!QIsUnsignedEnum<qint8>::value));
 
-Q_STATIC_ASSERT((!is_signed<quint8>::value));
-Q_STATIC_ASSERT(( is_signed<qint8>::value));
+Q_STATIC_ASSERT((!QIsSignedEnum<quint8>::value));
+Q_STATIC_ASSERT(( QIsSignedEnum<qint8>::value));
 
-Q_STATIC_ASSERT(( is_unsigned<quint16>::value));
-Q_STATIC_ASSERT((!is_unsigned<qint16>::value));
+Q_STATIC_ASSERT(( QIsUnsignedEnum<quint16>::value));
+Q_STATIC_ASSERT((!QIsUnsignedEnum<qint16>::value));
 
-Q_STATIC_ASSERT((!is_signed<quint16>::value));
-Q_STATIC_ASSERT(( is_signed<qint16>::value));
+Q_STATIC_ASSERT((!QIsSignedEnum<quint16>::value));
+Q_STATIC_ASSERT(( QIsSignedEnum<qint16>::value));
 
-Q_STATIC_ASSERT(( is_unsigned<quint32>::value));
-Q_STATIC_ASSERT((!is_unsigned<qint32>::value));
+Q_STATIC_ASSERT(( QIsUnsignedEnum<quint32>::value));
+Q_STATIC_ASSERT((!QIsUnsignedEnum<qint32>::value));
 
-Q_STATIC_ASSERT((!is_signed<quint32>::value));
-Q_STATIC_ASSERT(( is_signed<qint32>::value));
+Q_STATIC_ASSERT((!QIsSignedEnum<quint32>::value));
+Q_STATIC_ASSERT(( QIsSignedEnum<qint32>::value));
 
-Q_STATIC_ASSERT(( is_unsigned<quint64>::value));
-Q_STATIC_ASSERT((!is_unsigned<qint64>::value));
+Q_STATIC_ASSERT(( QIsUnsignedEnum<quint64>::value));
+Q_STATIC_ASSERT((!QIsUnsignedEnum<qint64>::value));
 
-Q_STATIC_ASSERT((!is_signed<quint64>::value));
-Q_STATIC_ASSERT(( is_signed<qint64>::value));
+Q_STATIC_ASSERT((!QIsSignedEnum<quint64>::value));
+Q_STATIC_ASSERT(( QIsSignedEnum<qint64>::value));
 
 } // namespace QtPrivate
 
-- 
cgit v1.2.3