diff options
Diffstat (limited to 'sources/shiboken6/generator')
-rw-r--r-- | sources/shiboken6/generator/generator.cpp | 8 | ||||
-rw-r--r-- | sources/shiboken6/generator/generator.h | 4 |
2 files changed, 6 insertions, 6 deletions
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; |