Type system: Add attribute indicating C++ 11 enum classes

Introduce enumeration for the type to EnumTypeEntry which can be specified
by the boolean "class" attribute. For the enum classes, the value names
need to be qualified by the enum name to match the C++ API.

For the C++ generator, add an overload to
Shiboken::createScopedEnumItem() that takes a PyTypeObject and add the enum
items to the enum so that the name is in the enum scope.

Change-Id: Ia0e469d13b08c196b9ddd965b9cf3cc62a38630b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 13 insertions, 10 deletions

diff --git a/sources/shiboken2/ApiExtractor/typesystem.h b/sources/shiboken2/ApiExtractor/typesystem.h
index f2b5a9320..62d348f69 100644
--- a/sources/shiboken2/ApiExtractor/typesystem.h
+++ b/sources/shiboken2/ApiExtractor/typesystem.h
@@ -1045,6 +1045,12 @@ private:
 class EnumTypeEntry : public TypeEntry
 {
 public:
+    enum EnumKind {
+        CEnum,         // Standard C: enum Foo { value1, value2 }
+        AnonymousEnum, //             enum { value1, value2 }
+        EnumClass      // C++ 11    : enum class Foo { value1, value2 }
+    };
+
     explicit EnumTypeEntry(const QString &nspace, const QString &enumName, double vr);
 
     QString targetLangPackage() const override;
@@ -1065,6 +1071,9 @@ public:
         m_qualifier = q;
     }
 
+    EnumKind enumKind() const { return m_enumKind; }
+    void setEnumKind(EnumKind kind) { m_enumKind = kind; }
+
     bool preferredConversion() const override;
 
     bool isBoundsChecked() const
@@ -1108,7 +1117,7 @@ public:
         m_extensible = is;
     }
 
-    bool isEnumValueRejected(const QString &name)
+    bool isEnumValueRejected(const QString &name) const
     {
         return m_rejectedEnums.contains(name);
     }
@@ -1130,14 +1139,7 @@ public:
         m_forceInteger = force;
     }
 
-    bool isAnonymous() const
-    {
-        return m_anonymous;
-    }
-    void setAnonymous(bool anonymous)
-    {
-        m_anonymous = anonymous;
-    }
+    bool isAnonymous() const { return m_enumKind == AnonymousEnum; }
 
 private:
     QString m_packageName;
@@ -1151,9 +1153,10 @@ private:
 
     FlagsTypeEntry *m_flags = nullptr;
 
+    EnumKind m_enumKind = CEnum;
+
     bool m_extensible = false;
     bool m_forceInteger = false;
-    bool m_anonymous = false;
 };
 
 // EnumValueTypeEntry is used for resolving integer type templates