diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-26 08:03:54 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-26 08:04:41 +0200 |
commit | 9b01aae7777c7ccde9eed1a8c55aead1524e00e5 (patch) | |
tree | c62834ca412f290485dd96d2a7522809b8fce6e1 /sources/shiboken2/ApiExtractor/typesystem.h | |
parent | 2156651b39fbb6717ed936c94dcd28295436e0a4 (diff) | |
parent | 0b842db3a95a44fbda3379d2093cb52f8ae2a1ff (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.11
Change-Id: Id40dab17b02800199f70072115d7473041f683d8
Diffstat (limited to 'sources/shiboken2/ApiExtractor/typesystem.h')
-rw-r--r-- | sources/shiboken2/ApiExtractor/typesystem.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/sources/shiboken2/ApiExtractor/typesystem.h b/sources/shiboken2/ApiExtractor/typesystem.h index 2f534c93d..eae064134 100644 --- a/sources/shiboken2/ApiExtractor/typesystem.h +++ b/sources/shiboken2/ApiExtractor/typesystem.h @@ -1041,12 +1041,6 @@ 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, const QVersionNumber &vr); @@ -1068,9 +1062,6 @@ public: m_qualifier = q; } - EnumKind enumKind() const { return m_enumKind; } - void setEnumKind(EnumKind kind) { m_enumKind = kind; } - bool preferredConversion() const override; bool isBoundsChecked() const @@ -1136,8 +1127,6 @@ public: m_forceInteger = force; } - bool isAnonymous() const { return m_enumKind == AnonymousEnum; } - private: QString m_packageName; QString m_qualifier; @@ -1150,8 +1139,6 @@ private: FlagsTypeEntry *m_flags = nullptr; - EnumKind m_enumKind = CEnum; - bool m_extensible = false; bool m_forceInteger = false; }; |