diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-12-21 10:42:56 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-22 13:01:06 +0000 |
commit | 90b1d60d4031c59e923763ff65d51ae0e31cd5c5 (patch) | |
tree | edca43e56e413d9c7f9e7a46cd089dda67082f39 | |
parent | 9db650523b194ced96c6d05517a4eee8a834506e (diff) |
shiboken6: Move API for primitive/container types to generator
Change-Id: I53f4b9634568a5626d972e50cc67f4bec8fe92fc
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit eac11718bd7fe346fbc65e922e3a0222613ff4a9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | sources/shiboken6/ApiExtractor/apiextractor.cpp | 10 | ||||
-rw-r--r-- | sources/shiboken6/ApiExtractor/apiextractor.h | 2 | ||||
-rw-r--r-- | sources/shiboken6/generator/generator.cpp | 8 | ||||
-rw-r--r-- | sources/shiboken6/generator/generator.h | 4 |
4 files changed, 6 insertions, 18 deletions
diff --git a/sources/shiboken6/ApiExtractor/apiextractor.cpp b/sources/shiboken6/ApiExtractor/apiextractor.cpp index 019f3db48..f429b7dee 100644 --- a/sources/shiboken6/ApiExtractor/apiextractor.cpp +++ b/sources/shiboken6/ApiExtractor/apiextractor.cpp @@ -146,16 +146,6 @@ const AbstractMetaClassList &ApiExtractor::smartPointers() const return m_builder->smartPointers(); } -PrimitiveTypeEntryList ApiExtractor::primitiveTypes() const -{ - return TypeDatabase::instance()->primitiveTypes(); -} - -ContainerTypeEntryList ApiExtractor::containerTypes() const -{ - return TypeDatabase::instance()->containerTypes(); -} - std::optional<AbstractMetaEnum> ApiExtractor::findAbstractMetaEnum(const TypeEntry* typeEntry) const { diff --git a/sources/shiboken6/ApiExtractor/apiextractor.h b/sources/shiboken6/ApiExtractor/apiextractor.h index 5782bd51a..0d05f51ac 100644 --- a/sources/shiboken6/ApiExtractor/apiextractor.h +++ b/sources/shiboken6/ApiExtractor/apiextractor.h @@ -85,8 +85,6 @@ public: const AbstractMetaFunctionCList &globalFunctions() const; const AbstractMetaClassList &classes() const; const AbstractMetaClassList &smartPointers() const; - PrimitiveTypeEntryList primitiveTypes() const; - ContainerTypeEntryList containerTypes() const; std::optional<AbstractMetaEnum> findAbstractMetaEnum(const TypeEntry* typeEntry) const; diff --git a/sources/shiboken6/generator/generator.cpp b/sources/shiboken6/generator/generator.cpp index 10c5157ed..1958d00a5 100644 --- a/sources/shiboken6/generator/generator.cpp +++ b/sources/shiboken6/generator/generator.cpp @@ -372,14 +372,14 @@ const AbstractMetaEnumList &Generator::globalEnums() const return m_d->apiextractor->globalEnums(); } -PrimitiveTypeEntryList Generator::primitiveTypes() const +PrimitiveTypeEntryList Generator::primitiveTypes() { - return m_d->apiextractor->primitiveTypes(); + return TypeDatabase::instance()->primitiveTypes(); } -ContainerTypeEntryList Generator::containerTypes() const +ContainerTypeEntryList Generator::containerTypes() { - return m_d->apiextractor->containerTypes(); + return TypeDatabase::instance()->containerTypes(); } std::optional<AbstractMetaEnum> diff --git a/sources/shiboken6/generator/generator.h b/sources/shiboken6/generator/generator.h index 9cf1abe45..d61fa0117 100644 --- a/sources/shiboken6/generator/generator.h +++ b/sources/shiboken6/generator/generator.h @@ -276,10 +276,10 @@ protected: const AbstractMetaEnumList &globalEnums() const; /// Returns all primitive types found by APIExtractor - PrimitiveTypeEntryList primitiveTypes() const; + static PrimitiveTypeEntryList primitiveTypes(); /// Returns all container types found by APIExtractor - ContainerTypeEntryList containerTypes() const; + static ContainerTypeEntryList containerTypes(); /// Returns an AbstractMetaEnum for a given TypeEntry that is an EnumTypeEntry, or nullptr if not found. std::optional<AbstractMetaEnum> findAbstractMetaEnum(const TypeEntry *typeEntry) const; |