Remove QConditional in favor of std::conditional/std::is_unsigned

Change-Id: I5e0b9f640eb49aa7f5afdd4f3f15e027659e78ea
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

1 files changed, 2 insertions, 4 deletions

diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h
index f18baf7065..77b562ec5b 100644
--- a/src/corelib/tools/qstring.h
+++ b/src/corelib/tools/qstring.h
@@ -896,10 +896,8 @@ private:
     template <typename T> static
     T toIntegral_helper(const QChar *data, int len, bool *ok, int base)
     {
-        // ### Qt6: use std::conditional<std::is_unsigned<T>::value, qulonglong, qlonglong>::type
-        const bool isUnsigned = T(0) < T(-1);
-        typedef typename QtPrivate::QConditional<isUnsigned, qulonglong, qlonglong>::Type Int64;
-        typedef typename QtPrivate::QConditional<isUnsigned, uint, int>::Type Int32;
+        using Int64 = typename std::conditional<std::is_unsigned<T>::value, qulonglong, qlonglong>::type;
+        using Int32 = typename std::conditional<std::is_unsigned<T>::value, uint, int>::type;
 
         // we select the right overload by casting size() to int or uint
         Int64 val = toIntegral_helper(data, Int32(len), ok, base);