From b60055274431bbc33de9e182173281b608033708 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 30 Nov 2020 18:19:14 +0100 Subject: shiboken6: Fix some functions to take a const AbstractMetaClass * Change-Id: Iccee5cab96362250997daf39a354ddc7e8ab2909 Reviewed-by: Cristian Maureira-Fredes --- sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp | 18 +++++++++--------- sources/shiboken6/ApiExtractor/abstractmetabuilder_p.h | 18 +++++++++--------- sources/shiboken6/ApiExtractor/abstractmetalang.cpp | 6 +++--- sources/shiboken6/ApiExtractor/abstractmetalang.h | 4 ++-- 4 files changed, 23 insertions(+), 23 deletions(-) (limited to 'sources') diff --git a/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp index 686a28993..0d86e028f 100644 --- a/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp +++ b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp @@ -177,7 +177,7 @@ void AbstractMetaBuilderPrivate::checkFunctionModifications() } AbstractMetaClass *AbstractMetaBuilderPrivate::argumentToClass(const ArgumentModelItem &argument, - AbstractMetaClass *currentClass) + const AbstractMetaClass *currentClass) { AbstractMetaClass *returned = nullptr; auto type = translateType(argument->type(), currentClass); @@ -1121,7 +1121,7 @@ static inline QString qualifiedFieldSignatureWithType(const QString &className, std::optional AbstractMetaBuilderPrivate::traverseField(const VariableModelItem &field, - AbstractMetaClass *cls) + const AbstractMetaClass *cls) { QString fieldName = field->name(); QString className = cls->typeEntry()->qualifiedCppName(); @@ -1710,7 +1710,7 @@ static bool applyArrayArgumentModifications(const FunctionModificationList &func } AbstractMetaFunction *AbstractMetaBuilderPrivate::traverseFunction(const FunctionModelItem &functionItem, - AbstractMetaClass *currentClass) + const AbstractMetaClass *currentClass) { if (functionItem->isDeleted() || !functionItem->templateParameters().isEmpty()) return nullptr; @@ -1979,7 +1979,7 @@ static const TypeEntry* findTypeEntryUsingContext(const AbstractMetaClass* metaC // Helper for findTypeEntries/translateTypeStatic() TypeEntries AbstractMetaBuilderPrivate::findTypeEntriesHelper(const QString &qualifiedName, const QString &name, - AbstractMetaClass *currentClass, + const AbstractMetaClass *currentClass, AbstractMetaBuilderPrivate *d) { // 5.1 - Try first using the current scope @@ -2026,7 +2026,7 @@ TypeEntries AbstractMetaBuilderPrivate::findTypeEntriesHelper(const QString &qua // and does some error checking. TypeEntries AbstractMetaBuilderPrivate::findTypeEntries(const QString &qualifiedName, const QString &name, - AbstractMetaClass *currentClass, + const AbstractMetaClass *currentClass, AbstractMetaBuilderPrivate *d, QString *errorMessage) { @@ -2078,7 +2078,7 @@ const AbstractMetaClass *AbstractMetaBuilderPrivate::resolveTypeSystemTypeDef(co std::optional AbstractMetaBuilderPrivate::translateType(const TypeInfo &_typei, - AbstractMetaClass *currentClass, + const AbstractMetaClass *currentClass, TranslateTypeFlags flags, QString *errorMessage) { @@ -2093,7 +2093,7 @@ static bool isNumber(const QString &s) std::optional AbstractMetaBuilderPrivate::translateTypeStatic(const TypeInfo &_typei, - AbstractMetaClass *currentClass, + const AbstractMetaClass *currentClass, AbstractMetaBuilderPrivate *d, TranslateTypeFlags flags, QString *errorMessageIn) @@ -2374,7 +2374,7 @@ qint64 AbstractMetaBuilderPrivate::findOutValueFromString(const QString &stringV QString AbstractMetaBuilderPrivate::fixDefaultValue(const ArgumentModelItem &item, const AbstractMetaType &type, - AbstractMetaClass *implementingClass, + const AbstractMetaClass *implementingClass, int /* argumentIndex */) { QString expr = item->defaultValueExpression(); @@ -2916,7 +2916,7 @@ void AbstractMetaBuilderPrivate::dumpLog() const writeRejectLogFile(m_logDirectory + QLatin1String("mjb_rejected_fields.log"), m_rejectedFields); } -using ClassIndexHash = QHash; +using ClassIndexHash = QHash; static ClassIndexHash::ConstIterator findByTypeEntry(const ClassIndexHash &map, const TypeEntry *typeEntry) diff --git a/sources/shiboken6/ApiExtractor/abstractmetabuilder_p.h b/sources/shiboken6/ApiExtractor/abstractmetabuilder_p.h index 1dc1dd3d7..2dc650ef9 100644 --- a/sources/shiboken6/ApiExtractor/abstractmetabuilder_p.h +++ b/sources/shiboken6/ApiExtractor/abstractmetabuilder_p.h @@ -76,7 +76,7 @@ public: NamespaceModelItem currentScope() const { return m_scopes.constLast(); } AbstractMetaClass *argumentToClass(const ArgumentModelItem &, - AbstractMetaClass *currentClass); + const AbstractMetaClass *currentClass); void addAbstractMetaClass(AbstractMetaClass *cls, const _CodeModelItem *item); AbstractMetaClass *traverseTypeDef(const FileModelItem &dom, @@ -113,9 +113,9 @@ public: bool traverseAddedMemberFunction(const AddedFunctionPtr &addedFunc, AbstractMetaClass *metaClass); AbstractMetaFunction *traverseFunction(const FunctionModelItem &function, - AbstractMetaClass *currentClass); + const AbstractMetaClass *currentClass); std::optional traverseField(const VariableModelItem &field, - AbstractMetaClass *cls); + const AbstractMetaClass *cls); void checkFunctionModifications(); void registerHashFunction(const FunctionModelItem &functionItem, AbstractMetaClass *currentClass); @@ -143,20 +143,20 @@ public: void setupFunctionDefaults(AbstractMetaFunction *metaFunction, AbstractMetaClass *metaClass); - QString fixDefaultValue(const ArgumentModelItem &item, const AbstractMetaType &type, AbstractMetaClass *, - int argumentIndex); + QString fixDefaultValue(const ArgumentModelItem &item, const AbstractMetaType &type, + const AbstractMetaClass *, int argumentIndex); std::optional - translateType(const TypeInfo &type, AbstractMetaClass *currentClass, + translateType(const TypeInfo &type, const AbstractMetaClass *currentClass, TranslateTypeFlags flags = {}, QString *errorMessage = nullptr); static std::optional - translateTypeStatic(const TypeInfo &type, AbstractMetaClass *current, + translateTypeStatic(const TypeInfo &type, const AbstractMetaClass *current, AbstractMetaBuilderPrivate *d = nullptr, TranslateTypeFlags flags = {}, QString *errorMessageIn = nullptr); static TypeEntries findTypeEntriesHelper(const QString &qualifiedName, const QString &name, - AbstractMetaClass *currentClass = nullptr, + const AbstractMetaClass *currentClass = nullptr, AbstractMetaBuilderPrivate *d = nullptr); static TypeEntries findTypeEntries(const QString &qualifiedName, const QString &name, - AbstractMetaClass *currentClass = nullptr, + const AbstractMetaClass *currentClass = nullptr, AbstractMetaBuilderPrivate *d = nullptr, QString *errorMessage = nullptr); diff --git a/sources/shiboken6/ApiExtractor/abstractmetalang.cpp b/sources/shiboken6/ApiExtractor/abstractmetalang.cpp index 4b923309e..52a8570e5 100644 --- a/sources/shiboken6/ApiExtractor/abstractmetalang.cpp +++ b/sources/shiboken6/ApiExtractor/abstractmetalang.cpp @@ -89,7 +89,7 @@ public: AbstractMetaClass *m_defaultSuperclass = nullptr; AbstractMetaClassList m_baseClasses; // Real base classes after setting up inheritance AbstractMetaTypeList m_baseTemplateInstantiations; - AbstractMetaClass *m_extendedNamespace = nullptr; + const AbstractMetaClass *m_extendedNamespace = nullptr; const AbstractMetaClass *m_templateBaseClass = nullptr; AbstractMetaFunctionCList m_functions; @@ -465,12 +465,12 @@ void AbstractMetaClass::setBaseClass(AbstractMetaClass *baseClass) } } -AbstractMetaClass *AbstractMetaClass::extendedNamespace() const +const AbstractMetaClass *AbstractMetaClass::extendedNamespace() const { return d->m_extendedNamespace; } -void AbstractMetaClass::setExtendedNamespace(AbstractMetaClass *e) +void AbstractMetaClass::setExtendedNamespace(const AbstractMetaClass *e) { d->m_extendedNamespace = e; } diff --git a/sources/shiboken6/ApiExtractor/abstractmetalang.h b/sources/shiboken6/ApiExtractor/abstractmetalang.h index f0c08d673..f1380e9da 100644 --- a/sources/shiboken6/ApiExtractor/abstractmetalang.h +++ b/sources/shiboken6/ApiExtractor/abstractmetalang.h @@ -208,8 +208,8 @@ public: /** * \return the namespace from another package which this namespace extends. */ - AbstractMetaClass *extendedNamespace() const; - void setExtendedNamespace(AbstractMetaClass *e); + const AbstractMetaClass *extendedNamespace() const; + void setExtendedNamespace(const AbstractMetaClass *e); const AbstractMetaClassList &innerClasses() const; void addInnerClass(AbstractMetaClass* cl); -- cgit v1.2.3