diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2024-11-25 15:35:08 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2024-12-03 10:02:59 +0100 |
| commit | 63b4ad5b21ca08e8b71c82ee4f35f4a611df40fa (patch) | |
| tree | b54d30bcbff7ad5585f6e638c1d1f4990d834ece /src/qmlcompiler/qqmljsregistercontent.cpp | |
| parent | 750af826eb6aecbd01111ccf6501b0dd4f1edf9c (diff) | |
QmlCompiler: Clean up API of QQmlJSRegisterContent
Rename some methods and write some comments.
Task-number: QTBUG-124670
Change-Id: I3046d545374c92dd7441d58d2b8fe2abc25078b8
Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
Diffstat (limited to 'src/qmlcompiler/qqmljsregistercontent.cpp')
| -rw-r--r-- | src/qmlcompiler/qqmljsregistercontent.cpp | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/qmlcompiler/qqmljsregistercontent.cpp b/src/qmlcompiler/qqmljsregistercontent.cpp index 6f4e893ef8..dc74c1a0b2 100644 --- a/src/qmlcompiler/qqmljsregistercontent.cpp +++ b/src/qmlcompiler/qqmljsregistercontent.cpp @@ -251,7 +251,7 @@ QString QQmlJSRegisterContent::descriptiveName() const return u"import namespace %1"_s.arg(importNamespace()); } case Kind::Conversion: { - return u"conversion to %1"_s.arg(conversionResult()->internalName()); + return u"conversion to %1"_s.arg(conversionResultType()->internalName()); } case Kind::MethodCall: { const QQmlJSMetaMethod &method = std::get<QQmlJSMetaMethod>(d->m_content); @@ -269,7 +269,7 @@ QString QQmlJSRegisterContent::containedTypeName() const switch (variant()) { case QQmlJSRegisterContent::MetaType: - type = scopeType().containedType(); + type = scopeType(); break; default: type = containedType(); @@ -374,7 +374,7 @@ QQmlJSRegisterContent QQmlJSRegisterContent::attacher() const { Q_ASSERT(d); Q_ASSERT(d->m_variant == Attachment); - return scopeType(); + return scope(); } /*! @@ -386,9 +386,9 @@ QQmlJSRegisterContent QQmlJSRegisterContent::attachee() const { Q_ASSERT(d); Q_ASSERT(d->m_variant == Attachment); - QQmlJSRegisterContent attachee = attacher().scopeType(); + QQmlJSRegisterContent attachee = attacher().scope(); while (attachee.variant() == ModulePrefix) - attachee = attachee.scopeType(); + attachee = attachee.scope(); return attachee; } @@ -412,16 +412,16 @@ QQmlJSScope::ConstPtr QQmlJSRegisterContent::containedType() const if (isImportNamespace()) return importNamespaceType(); if (isConversion()) - return conversionResult(); + return conversionResultType(); if (isMethodCall()) return std::get<QQmlJSMetaMethod>(d->m_content).returnType(); Q_UNREACHABLE_RETURN({}); } -QQmlJSRegisterContent QQmlJSRegisterContent::scopeType() const +QQmlJSScope::ConstPtr QQmlJSRegisterContent::scopeType() const { - return d ? d->m_scope : QQmlJSRegisterContent(); + return d ? d->m_scope.containedType() : QQmlJSScope::ConstPtr(); } QQmlJSScope::ConstPtr QQmlJSRegisterContent::type() const @@ -483,7 +483,7 @@ QQmlJSScope::ConstPtr QQmlJSRegisterContent::importNamespaceType() const return std::get<std::pair<uint, QQmlJSScope::ConstPtr>>(d->m_content).second; } -QQmlJSScope::ConstPtr QQmlJSRegisterContent::conversionResult() const +QQmlJSScope::ConstPtr QQmlJSRegisterContent::conversionResultType() const { Q_ASSERT(isConversion()); return std::get<QQmlJSRegisterContentPrivate::ConvertedTypes>(d->m_content).result; @@ -512,6 +512,11 @@ QQmlJSRegisterContent::ContentVariant QQmlJSRegisterContent::variant() const return d ? d->m_variant : Unknown; } +QQmlJSRegisterContent QQmlJSRegisterContent::scope() const +{ + return d ? d->m_scope : QQmlJSRegisterContent(); +} + QQmlJSRegisterContent QQmlJSRegisterContent::storage() const { return d ? d->m_storage : QQmlJSRegisterContent(); |