1 files changed, 14 insertions, 6 deletions
diff --git a/sources/shiboken6/ApiExtractor/parser/enumvalue.h b/sources/shiboken6/ApiExtractor/parser/enumvalue.h
index bae2b30bf..bbd5a712d 100644
--- a/sources/shiboken6/ApiExtractor/parser/enumvalue.h
+++ b/sources/shiboken6/ApiExtractor/parser/enumvalue.h
@@ -4,7 +4,9 @@
 #ifndef ENUMVALUE_H
 #define ENUMVALUE_H
 
-#include <QtCore/QtGlobal>
+#include <QtCore/qtypes.h>
+#include <QtCore/qtclasshelpermacros.h>
+#include <QtCore/QtCompare>
 
 QT_FORWARD_DECLARE_CLASS(QDebug)
 QT_FORWARD_DECLARE_CLASS(QString)
@@ -20,18 +22,29 @@ public:
     };
 
     QString toString() const;
+    QString toHex(int fieldWidth = 0) const;
 
     Type type() { return m_type; }
     qint64 value() const { return m_value; }
     quint64 unsignedValue() const { return m_unsignedValue; }
     bool isNullValue() const { return m_type == Signed ? m_value == 0 : m_unsignedValue == 0u; }
+    bool isNegative() const { return m_type == Signed && m_value < 0; }
 
     void setValue(qint64 v);
     void setUnsignedValue(quint64 v);
 
+    EnumValue toUnsigned() const;
+
     bool equals(const EnumValue &rhs) const;
 
+    void formatDebug(QDebug &d) const;
+    void formatDebugHex(QDebug &d) const;
+
 private:
+    friend bool comparesEqual(const EnumValue &lhs,
+                              const EnumValue &rhs) noexcept;
+    Q_DECLARE_EQUALITY_COMPARABLE(EnumValue)
+
 #ifndef QT_NO_DEBUG_STREAM
     friend QDebug operator<<(QDebug, const EnumValue &);
 #endif
@@ -45,9 +58,4 @@ private:
     Type m_type = Signed;
 };
 
-inline bool operator==(const EnumValue &e1, const EnumValue &e2)
-{ return e1.equals(e2); }
-inline bool operator!=(const EnumValue &e1, const EnumValue &e2)
-{ return !e1.equals(e2); }
-
 #endif // ENUMVALUE_H