diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-12-02 15:14:35 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-12-03 15:52:45 +0000 |
commit | 2f7295a288c76b40e74bf9cd1c87c74379bd285c (patch) | |
tree | 8421d80533608b256232f42a6333b13cdb96b859 /sources/shiboken6/ApiExtractor/abstractmetafunction.cpp | |
parent | 288fadb796ec4e11e99e3752d531ada7edf15d75 (diff) |
shiboken6: Use a QSharedDataPointer for ArgumentModification
For reasons of consistency and header hygiene.
As a drive by, remove unused argument modification replace-value.
Change-Id: I44d0a244c89f2bf10242544111d23e072df3b480
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken6/ApiExtractor/abstractmetafunction.cpp')
-rw-r--r-- | sources/shiboken6/ApiExtractor/abstractmetafunction.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp b/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp index 79ca961f6..e2d0fb9dc 100644 --- a/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp +++ b/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp @@ -431,9 +431,9 @@ QList<ReferenceCount> AbstractMetaFunction::referenceCounts(const AbstractMetaCl for (const auto &mod : modifications(cls)) { for (const ArgumentModification &argumentMod : mod.argument_mods()) { - if (argumentMod.index != idx && idx != -2) + if (argumentMod.index() != idx && idx != -2) continue; - returned += argumentMod.referenceCounts; + returned += argumentMod.referenceCounts(); } } @@ -444,9 +444,9 @@ ArgumentOwner AbstractMetaFunction::argumentOwner(const AbstractMetaClass *cls, { for (const auto &mod : modifications(cls)) { for (const ArgumentModification &argumentMod : mod.argument_mods()) { - if (argumentMod.index != idx) + if (argumentMod.index() != idx) continue; - return argumentMod.owner; + return argumentMod.owner(); } } return ArgumentOwner(); @@ -456,10 +456,10 @@ QString AbstractMetaFunction::conversionRule(TypeSystem::Language language, int { for (const auto &modification : modifications(declaringClass())) { for (const ArgumentModification &argumentModification : modification.argument_mods()) { - if (argumentModification.index != key) + if (argumentModification.index() != key) continue; - for (const CodeSnip &snip : argumentModification.conversion_rules) { + for (const CodeSnip &snip : argumentModification.conversionRules()) { if (snip.language == language && !snip.code().isEmpty()) return snip.code(); } @@ -474,8 +474,8 @@ bool AbstractMetaFunction::argumentRemoved(int key) const { for (const auto &modification : modifications(declaringClass())) { for (const ArgumentModification &argumentModification : modification.argument_mods()) { - if (argumentModification.index == key) { - if (argumentModification.removed) + if (argumentModification.index() == key) { + if (argumentModification.isRemoved()) return true; } } @@ -625,8 +625,8 @@ TypeSystem::Ownership AbstractMetaFunction::ownership(const AbstractMetaClass *c { for (const auto &modification : modifications(cls)) { for (const ArgumentModification &argumentModification : modification.argument_mods()) { - if (argumentModification.index == key) - return argumentModification.ownerships.value(language, TypeSystem::InvalidOwnership); + if (argumentModification.index() == key) + return argumentModification.ownerships().value(language, TypeSystem::InvalidOwnership); } } @@ -637,9 +637,9 @@ QString AbstractMetaFunction::typeReplaced(int key) const { for (const auto &modification : modifications(declaringClass())) { for (const ArgumentModification &argumentModification : modification.argument_mods()) { - if (argumentModification.index == key - && !argumentModification.modified_type.isEmpty()) { - return argumentModification.modified_type; + if (argumentModification.index() == key + && !argumentModification.modifiedType().isEmpty()) { + return argumentModification.modifiedType(); } } } @@ -651,7 +651,7 @@ bool AbstractMetaFunction::isModifiedToArray(int argumentIndex) const { for (const auto &modification : modifications(declaringClass())) { for (const ArgumentModification &argumentModification : modification.argument_mods()) { - if (argumentModification.index == argumentIndex && argumentModification.array != 0) + if (argumentModification.index() == argumentIndex && argumentModification.isArray()) return true; } } @@ -853,7 +853,7 @@ bool AbstractMetaFunction::hasSignatureModifications() const // since zero represents the return type and we're // interested only in checking the function arguments, // it will be ignored. - if (argmod.index > 0) + if (argmod.index() > 0) return true; } } |