1 files changed, 24 insertions, 6 deletions
diff --git a/sources/shiboken6/ApiExtractor/abstractmetaenum.h b/sources/shiboken6/ApiExtractor/abstractmetaenum.h
index 1151b7164..03d7a3082 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetaenum.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetaenum.h
@@ -7,6 +7,7 @@
 #include "abstractmetalang_typedefs.h"
 #include "enclosingclassmixin.h"
 #include "parser/codemodel_enums.h"
+#include "typesystem_typedefs.h"
 
 #include <QtCore/QSharedDataPointer>
 #include <QtCore/QString>
@@ -27,8 +28,8 @@ public:
     AbstractMetaEnumValue();
     AbstractMetaEnumValue(const AbstractMetaEnumValue &);
     AbstractMetaEnumValue &operator=(const AbstractMetaEnumValue &);
-    AbstractMetaEnumValue(AbstractMetaEnumValue &&);
-    AbstractMetaEnumValue &operator=(AbstractMetaEnumValue &&);
+    AbstractMetaEnumValue(AbstractMetaEnumValue &&) noexcept;
+    AbstractMetaEnumValue &operator=(AbstractMetaEnumValue &&) noexcept;
     ~AbstractMetaEnumValue();
 
     EnumValue value() const;
@@ -40,9 +41,14 @@ public:
     QString name() const;
     void setName(const QString &name);
 
+    bool isDeprecated() const;
+    void setDeprecated(bool deprecated);
+
     Documentation documentation() const;
     void setDocumentation(const Documentation& doc);
 
+    int usedBits() const;
+
 private:
     QSharedDataPointer<AbstractMetaEnumValueData> d;
 };
@@ -53,11 +59,12 @@ public:
     AbstractMetaEnum();
     AbstractMetaEnum(const AbstractMetaEnum &);
     AbstractMetaEnum &operator=(const AbstractMetaEnum &);
-    AbstractMetaEnum(AbstractMetaEnum &&);
-    AbstractMetaEnum &operator=(AbstractMetaEnum &&);
+    AbstractMetaEnum(AbstractMetaEnum &&) noexcept;
+    AbstractMetaEnum &operator=(AbstractMetaEnum &&) noexcept;
     ~AbstractMetaEnum();
 
     const AbstractMetaEnumValueList &values() const;
+    AbstractMetaEnumValueList nonRejectedValues() const;
     void addEnumValue(const AbstractMetaEnumValue &enumValue);
 
     std::optional<AbstractMetaEnumValue> findEnumValue(QStringView value) const;
@@ -70,6 +77,11 @@ public:
     bool isPrivate() const { return access() == Access::Private; }
     bool isProtected() const { return access() == Access::Protected; }
 
+    bool isDeprecated() const;
+    void setDeprecated(bool deprecated);
+    bool hasDeprecatedValues() const;
+    AbstractMetaEnumValueList deprecatedValues() const;
+
     const Documentation &documentation() const;
     void setDocumentation(const Documentation& doc);
 
@@ -88,12 +100,18 @@ public:
     bool hasQEnumsDeclaration() const;
     void setHasQEnumsDeclaration(bool on);
 
-    EnumTypeEntry *typeEntry() const;
-    void setTypeEntry(EnumTypeEntry *entry);
+    EnumTypeEntryCPtr typeEntry() const;
+    void setTypeEntry(const EnumTypeEntryCPtr &entry);
 
     bool isSigned() const;
     void setSigned(bool s);
 
+    QString underlyingType() const;
+    void setUnderlyingType(const QString &underlyingType);
+
+    static QString intTypeForSize(int usedBits, bool isSigned);
+    int usedBits() const;
+
 private:
     QSharedDataPointer<AbstractMetaEnumData> d;
 };