From 227b9cd0847a8ae305730063510390d29abaee6c Mon Sep 17 00:00:00 2001
From: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Date: Tue, 27 Dec 2022 16:52:11 +0100
Subject: [PATCH] QTypeInfo: remove further usages of isPointer / isIntegral

In preparation to their deprecation / removal.

Change-Id: Ia073a9f7caabbc06063a1e416b23cdb12788b283
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 tests/auto/corelib/global/qflags/tst_qflags.cpp          | 4 ++--
 tests/auto/corelib/tools/collections/tst_collections.cpp | 4 ++--
 tests/auto/corelib/tools/qpair/tst_qpair.cpp             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/auto/corelib/global/qflags/tst_qflags.cpp b/tests/auto/corelib/global/qflags/tst_qflags.cpp
index f267fc4497..c3f69846aa 100644
--- a/tests/auto/corelib/global/qflags/tst_qflags.cpp
+++ b/tests/auto/corelib/global/qflags/tst_qflags.cpp
@@ -301,7 +301,7 @@ Q_DECLARE_FLAGS( MyStrictNoOpFlags, MyStrictNoOpEnum )
 
 static_assert( !QTypeInfo<MyStrictFlags>::isComplex );
 static_assert( QTypeInfo<MyStrictFlags>::isRelocatable );
-static_assert( !QTypeInfo<MyStrictFlags>::isPointer );
+static_assert( !std::is_pointer_v<MyStrictFlags> );
 
 void tst_QFlags::classEnum()
 {
@@ -475,7 +475,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS( MyFlags )
 
 static_assert( !QTypeInfo<MyFlags>::isComplex );
 static_assert( QTypeInfo<MyFlags>::isRelocatable );
-static_assert( !QTypeInfo<MyFlags>::isPointer );
+static_assert( !std::is_pointer_v<MyFlags> );
 
 QTEST_MAIN(tst_QFlags)
 #include "tst_qflags.moc"
diff --git a/tests/auto/corelib/tools/collections/tst_collections.cpp b/tests/auto/corelib/tools/collections/tst_collections.cpp
index 965deca33f..2750b29854 100644
--- a/tests/auto/corelib/tools/collections/tst_collections.cpp
+++ b/tests/auto/corelib/tools/collections/tst_collections.cpp
@@ -294,8 +294,8 @@ constexpr inline bool has_prepend_v<QVarLengthArray<T,N>> = false; // deprecated
 
 void tst_Collections::typeinfo()
 {
-    QVERIFY(QTypeInfo<int*>::isPointer);
-    QVERIFY(!QTypeInfo<int>::isPointer);
+    QVERIFY(std::is_pointer_v<int*>);
+    QVERIFY(!std::is_pointer_v<int>);
     QVERIFY(QTypeInfo<QString>::isComplex);
     QVERIFY(!QTypeInfo<int>::isComplex);
 }
diff --git a/tests/auto/corelib/tools/qpair/tst_qpair.cpp b/tests/auto/corelib/tools/qpair/tst_qpair.cpp
index dc20c793ea..d3a706995f 100644
--- a/tests/auto/corelib/tools/qpair/tst_qpair.cpp
+++ b/tests/auto/corelib/tools/qpair/tst_qpair.cpp
@@ -65,7 +65,7 @@ static_assert( QTypeInfo<QPairPM>::isRelocatable );
 static_assert(!QTypeInfo<QPairPP>::isComplex);
 static_assert( QTypeInfo<QPairPP>::isRelocatable );
 
-static_assert(!QTypeInfo<QPairPP>::isPointer);
+static_assert(!std::is_pointer_v<QPairPP>);
 
 
 void tst_QPair::pairOfReferences()