From 4059af81d33bb1f6a7773b77d3039f2fc53fcd23 Mon Sep 17 00:00:00 2001
From: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Date: Thu, 27 May 2021 15:00:26 +0200
Subject: Stop using mixed enum arithmetic

It's deprecated. Port some unnamed enumerations (used only to
declare constants) to constexpr integers instead. Apply qToUnderlying
as needed.

Task-number: QTBUG-94059
Change-Id: Ifaa64ece966ce08df40dc71ffcfa7ac038110e0b
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/kernel/qvariant.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/corelib/kernel/qvariant.cpp')

diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 0c58d0b314..c16e669c2c 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -1155,17 +1155,17 @@ static const ushort mapIdFromQt3ToCurrent[MapFromThreeCount] =
 #endif
 };
 
-// enum values needed to map Qt5 based type id's to Qt6 based ones
-enum Qt5Types {
-    Qt5UserType = 1024,
-    Qt5LastCoreType = QMetaType::QCborMap,
-    Qt5FirstGuiType = 64,
-    Qt5LastGuiType = 87,
-    Qt5SizePolicy = 121,
-    Qt5RegExp = 27,
-    Qt5KeySequence = 75,
-    Qt5QQuaternion = 85
-};
+// values needed to map Qt5 based type id's to Qt6 based ones
+constexpr int Qt5UserType = 1024;
+constexpr int Qt5LastCoreType = QMetaType::QCborMap;
+constexpr int Qt5FirstGuiType = 64;
+constexpr int Qt5LastGuiType = 87;
+constexpr int Qt5SizePolicy = 121;
+constexpr int Qt5RegExp = 27;
+constexpr int Qt5KeySequence = 75;
+constexpr int Qt5QQuaternion = 85;
+
+constexpr int Qt6ToQt5GuiTypeDelta = qToUnderlying(QMetaType::FirstGuiType) - Qt5FirstGuiType;
 
 /*!
     Internal function for loading a variant from stream \a s. Use the
@@ -1205,7 +1205,7 @@ void QVariant::load(QDataStream &s)
         if (typeId == Qt5UserType) {
             typeId = QMetaType::User;
         } else if (typeId >= Qt5FirstGuiType && typeId <= Qt5LastGuiType) {
-            typeId += QMetaType::FirstGuiType - Qt5FirstGuiType;
+            typeId += Qt6ToQt5GuiTypeDelta;
         } else if (typeId == Qt5SizePolicy) {
             typeId = QMetaType::QSizePolicy;
         } else if (typeId == Qt5RegExp) {
@@ -1273,7 +1273,7 @@ void QVariant::save(QDataStream &s) const
             typeId = Qt5UserType;
             saveAsUserType = true;
         } else if (typeId >= QMetaType::FirstGuiType && typeId <= QMetaType::LastGuiType) {
-            typeId -= QMetaType::FirstGuiType - Qt5FirstGuiType;
+            typeId -= Qt6ToQt5GuiTypeDelta;
             if (typeId > Qt5LastGuiType) {
                 typeId = Qt5UserType;
                 saveAsUserType = true;
-- 
cgit v1.2.3