diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-03-21 09:29:58 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-19 10:36:17 +0000 |
commit | 6bb7322e47196186375a3733e9112860817ebb1d (patch) | |
tree | 72ad9417342894e4ea76062284c5fcb80c7081ec /sources/shiboken2/ApiExtractor/parser/codemodel.h | |
parent | 06fe31fd68823b53bbd0657e4bd63ef06b35137d (diff) |
shiboken: Detect class enums by Clang entirely
The Clang function clang_EnumDecl_isScoped() tells whether an enum is a class,
so, there is no need to specify that in the typesystem.
Use that information to pass it up to the metalang classes and revert the
parts of 44cb6c51e6c3b43376f284941454dc8c13b81c3f that added it to the
type system.
Task-number: PYSIDE-487
Change-Id: Ie10885f74168821d0307e91b6f1f7f3f30dd074b
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources/shiboken2/ApiExtractor/parser/codemodel.h')
-rw-r--r-- | sources/shiboken2/ApiExtractor/parser/codemodel.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.h b/sources/shiboken2/ApiExtractor/parser/codemodel.h index 2aaea1f78..b300cf249 100644 --- a/sources/shiboken2/ApiExtractor/parser/codemodel.h +++ b/sources/shiboken2/ApiExtractor/parser/codemodel.h @@ -631,10 +631,8 @@ 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) {} ~_EnumModelItem(); CodeModel::AccessPolicy accessPolicy() const; @@ -642,17 +640,18 @@ 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 private: - CodeModel::AccessPolicy m_accessPolicy; + CodeModel::AccessPolicy m_accessPolicy = CodeModel::Public; EnumeratorList m_enumerators; - bool m_anonymous; + EnumKind m_enumKind = CEnum; }; class _EnumeratorModelItem: public _CodeModelItem |