Merge remote-tracking branch 'origin/5.9' into 5.11

Change-Id: Id40dab17b02800199f70072115d7473041f683d8

1 files changed, 20 insertions, 10 deletions

diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.h b/sources/shiboken2/ApiExtractor/parser/codemodel.h
index 2aaea1f78..ed0eedf7d 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel.h
+++ b/sources/shiboken2/ApiExtractor/parser/codemodel.h
@@ -33,6 +33,7 @@
 
 #include "codemodel_fwd.h"
 #include "codemodel_enums.h"
+#include "enumvalue.h"
 
 #include <QtCore/QHash>
 #include <QtCore/QSet>
@@ -631,10 +632,10 @@ class _EnumModelItem: public _CodeModelItem
 public:
     DECLARE_MODEL_NODE(Enum)
 
-    explicit _EnumModelItem(CodeModel *model, int kind = __node_kind)
-        : _CodeModelItem(model, kind), m_accessPolicy(CodeModel::Public), m_anonymous(false)  {}
     explicit _EnumModelItem(CodeModel *model, const QString &name, int kind = __node_kind)
-        : _CodeModelItem(model, name, kind), m_accessPolicy(CodeModel::Public), m_anonymous(false) {}
+        : _CodeModelItem(model, name, kind) {}
+    explicit _EnumModelItem(CodeModel *model, int kind = __node_kind)
+        : _CodeModelItem(model, kind) {}
     ~_EnumModelItem();
 
     CodeModel::AccessPolicy accessPolicy() const;
@@ -642,17 +643,22 @@ public:
 
     EnumeratorList enumerators() const;
     void addEnumerator(EnumeratorModelItem item);
-    bool isAnonymous() const;
-    void setAnonymous(bool anonymous);
+
+    EnumKind enumKind() const { return m_enumKind; }
+    void setEnumKind(EnumKind kind) { m_enumKind = kind; }
 
 #ifndef QT_NO_DEBUG_STREAM
     void formatDebug(QDebug &d) const override;
 #endif
 
+    bool isSigned() const;
+    void setSigned(bool s);
+
 private:
-    CodeModel::AccessPolicy m_accessPolicy;
+    CodeModel::AccessPolicy m_accessPolicy = CodeModel::Public;
     EnumeratorList m_enumerators;
-    bool m_anonymous;
+    EnumKind m_enumKind = CEnum;
+    bool m_signed = true;
 };
 
 class _EnumeratorModelItem: public _CodeModelItem
@@ -666,15 +672,19 @@ public:
         : _CodeModelItem(model, name, kind) {}
     ~_EnumeratorModelItem();
 
-    QString value() const;
-    void setValue(const QString &value);
+    QString stringValue() const;
+    void setStringValue(const QString &stringValue);
+
+    EnumValue value() const { return m_value; }
+    void setValue(EnumValue v) { m_value = v; }
 
 #ifndef QT_NO_DEBUG_STREAM
     void formatDebug(QDebug &d) const override;
 #endif
 
 private:
-    QString m_value;
+    QString m_stringValue;
+    EnumValue m_value;
 };
 
 class _TemplateParameterModelItem: public _CodeModelItem