diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-04-12 15:04:39 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-04-15 10:23:20 +0000 |
commit | 16a16dc4d17e5643ddb1656b382a3f8ffe31fd8f (patch) | |
tree | f93109717819816eea15ff580fdc2a5a99b5fefe /sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp | |
parent | 28f76672a9d7bb38fd596ea27d07396dcedfc6e7 (diff) |
shiboken: Pass around struct AddedFunction by QSharedPointer
This is a preparatory step for storing it directly in
AbstractMetaFunction.
Task-number: PYSIDE-995
Change-Id: Ia281bb8d3d94d3d56549ec227a476d9750922323
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp')
-rw-r--r-- | sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp index 329e3b079..8373889d4 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp +++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp @@ -662,11 +662,11 @@ void AbstractMetaBuilderPrivate::traverseDom(const FileModelItem &dom) // Functions added to the module on the type system. const AddedFunctionList &globalUserFunctions = types->globalUserFunctions(); - for (const AddedFunction &addedFunc : globalUserFunctions) { + for (const AddedFunctionPtr &addedFunc : globalUserFunctions) { AbstractMetaFunction* metaFunc = traverseFunction(addedFunc); if (Q_UNLIKELY(!metaFunc)) { qFatal("Unable to traverse added global function \"%s\".", - qPrintable(addedFunc.name())); + qPrintable(addedFunc->name())); } metaFunc->setFunctionType(AbstractMetaFunction::NormalFunction); m_globalFunctions << metaFunc; @@ -1431,10 +1431,10 @@ void AbstractMetaBuilderPrivate::fillAddedFunctions(AbstractMetaClass *metaClass { // Add the functions added by the typesystem const AddedFunctionList &addedFunctions = metaClass->typeEntry()->addedFunctions(); - for (const AddedFunction &addedFunc : addedFunctions) { + for (const AddedFunctionPtr &addedFunc : addedFunctions) { if (!traverseFunction(addedFunc, metaClass)) { qFatal("Unable to traverse function \"%s\" added to \"%s\".", - qPrintable(addedFunc.name()), qPrintable(metaClass->name())); + qPrintable(addedFunc->name()), qPrintable(metaClass->name())); } } } @@ -1588,29 +1588,29 @@ void AbstractMetaBuilderPrivate::traverseEnums(const ScopeModelItem &scopeItem, } } -AbstractMetaFunction* AbstractMetaBuilderPrivate::traverseFunction(const AddedFunction& addedFunc) +AbstractMetaFunction* AbstractMetaBuilderPrivate::traverseFunction(const AddedFunctionPtr &addedFunc) { return traverseFunction(addedFunc, 0); } -AbstractMetaFunction* AbstractMetaBuilderPrivate::traverseFunction(const AddedFunction& addedFunc, +AbstractMetaFunction* AbstractMetaBuilderPrivate::traverseFunction(const AddedFunctionPtr &addedFunc, AbstractMetaClass *metaClass) { AbstractMetaFunction *metaFunction = new AbstractMetaFunction; - metaFunction->setConstant(addedFunc.isConstant()); - metaFunction->setName(addedFunc.name()); - metaFunction->setOriginalName(addedFunc.name()); + metaFunction->setConstant(addedFunc->isConstant()); + metaFunction->setName(addedFunc->name()); + metaFunction->setOriginalName(addedFunc->name()); AbstractMetaClass::Attributes visibility = - addedFunc.access() == AddedFunction::Public + addedFunc->access() == AddedFunction::Public ? AbstractMetaAttributes::Public : AbstractMetaAttributes::Protected; metaFunction->setVisibility(visibility); metaFunction->setUserAdded(true); - AbstractMetaAttributes::Attribute isStatic = addedFunc.isStatic() ? AbstractMetaFunction::Static : AbstractMetaFunction::None; + AbstractMetaAttributes::Attribute isStatic = addedFunc->isStatic() ? AbstractMetaFunction::Static : AbstractMetaFunction::None; metaFunction->setAttributes(metaFunction->attributes() | AbstractMetaAttributes::FinalInTargetLang | isStatic); - metaFunction->setType(translateType(addedFunc.returnType())); + metaFunction->setType(translateType(addedFunc->returnType())); - QVector<AddedFunction::TypeInfo> args = addedFunc.arguments(); + QVector<AddedFunction::TypeInfo> args = addedFunc->arguments(); AbstractMetaArgumentList metaArguments; for (int i = 0; i < args.count(); ++i) { @@ -1620,7 +1620,7 @@ AbstractMetaFunction* AbstractMetaBuilderPrivate::traverseFunction(const AddedFu if (Q_UNLIKELY(!type)) { qCWarning(lcShiboken, "Unable to translate type \"%s\" of argument %d of added function \"%s\".", - qPrintable(typeInfo.name), i + 1, qPrintable(addedFunc.name())); + qPrintable(typeInfo.name), i + 1, qPrintable(addedFunc->name())); delete metaFunction; return nullptr; } |