From 74fef3099021a006b55236e2963d017a81f37815 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Tue, 7 Jun 2022 16:07:34 +0300
Subject: [PATCH] remove now redundant compareNumericMetaType<T>() template

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 src/core/kernel/qvariant.cpp | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/core/kernel/qvariant.cpp b/src/core/kernel/qvariant.cpp
index a721f146f..256ad987b 100644
--- a/src/core/kernel/qvariant.cpp
+++ b/src/core/kernel/qvariant.cpp
@@ -120,20 +120,6 @@ static bool isNull(const QVariant::Private *d)
     return d->is_null;
 }
 
-/*
-  \internal
-  \since 4.4
-
-  We cannot use v_cast() for QMetaType's numeric types because they're smaller than QVariant::Private::Data,
-  which in turns makes v_cast() believe the value is stored in d->data.ptr. But
-  it's not, since we're a QMetaType type.
- */
-template<typename T>
-inline bool compareNumericMetaType(const QVariant::Private *const a, const QVariant::Private *const b)
-{
-    return *static_cast<const T *>(a->ptr) == *static_cast<const T *>(b->ptr);
-}
-
 /*!
   \internal
 
@@ -227,17 +213,17 @@ static bool compare(const QVariant::Private *a, const QVariant::Private *b)
     case QVariant::Invalid:
         return true;
     case QMetaType::Long:
-        return compareNumericMetaType<long>(a, b);
+        return *v_cast<long>(a) == *v_cast<long>(b);
     case QMetaType::ULong:
-        return compareNumericMetaType<ulong>(a, b);
+        return *v_cast<ulong>(a) == *v_cast<ulong>(b);
     case QMetaType::Short:
-        return compareNumericMetaType<short>(a, b);
+        return *v_cast<short>(a) == *v_cast<short>(b);
     case QMetaType::UShort:
-        return compareNumericMetaType<ushort>(a, b);
+        return *v_cast<ushort>(a) == *v_cast<ushort>(b);
     case QMetaType::UChar:
-        return compareNumericMetaType<uchar>(a, b);
+        return *v_cast<uchar>(a) == *v_cast<uchar>(b);
     case QMetaType::Char:
-        return compareNumericMetaType<char>(a, b);
+        return *v_cast<char>(a) == *v_cast<char>(b);
     default:
         break;
     }