diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-11-15 11:45:14 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-11-17 20:59:23 +0100 |
| commit | f9bddfa12d233d9ef01299869f4d491d62a0828e (patch) | |
| tree | 1ffdf0e7a013e43d849bf26ce454af1fd2c93b01 /src/qml/compiler/qqmlirbuilder.cpp | |
| parent | 2248ee16e0f143221803e644d2c4c5ac47a72d63 (diff) | |
Clean up property attributes (1/2)
Instead of directly accessing the attribute related members of
UiPublicMember, we access them via a function.
Moreover, we remove some redundancy: A property is
readonly/default/required if and only if the corresponding token is
valid. Thus we can drop the boolean members.
Change-Id: I22f15b2b037e857d2f9d3167cb761cba9516a135
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/compiler/qqmlirbuilder.cpp')
| -rw-r--r-- | src/qml/compiler/qqmlirbuilder.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp index b7295626ae..fc0da9db1b 100644 --- a/src/qml/compiler/qqmlirbuilder.cpp +++ b/src/qml/compiler/qqmlirbuilder.cpp @@ -984,8 +984,8 @@ bool IRBuilder::visit(QQmlJS::AST::UiPublicMember *node) const QStringView &name = node->name; Property *property = New<Property>(); - property->isReadOnly = node->isReadonlyMember; - property->isRequired = node->isRequired; + property->isReadOnly = node->isReadonly(); + property->isRequired = node->isRequired(); QV4::CompiledData::BuiltinType builtinPropertyType = Parameter::stringToBuiltinType(memberType); bool typeFound = builtinPropertyType != QV4::CompiledData::BuiltinType::InvalidBuiltin; @@ -1026,7 +1026,7 @@ bool IRBuilder::visit(QQmlJS::AST::UiPublicMember *node) if (illegalNames.contains(propName)) error = tr("Illegal property name"); else - error = _object->appendProperty(property, propName, node->isDefaultMember, node->defaultToken, &errorLocation); + error = _object->appendProperty(property, propName, node->isDefaultMember(), node->defaultToken(), &errorLocation); if (!error.isEmpty()) { if (errorLocation.startLine == 0) @@ -1409,7 +1409,7 @@ bool IRBuilder::appendAlias(QQmlJS::AST::UiPublicMember *node) { Alias *alias = New<Alias>(); alias->flags = 0; - if (node->isReadonlyMember) + if (node->isReadonly()) alias->flags |= QV4::CompiledData::Alias::IsReadOnly; const QString propName = node->name.toString(); @@ -1465,7 +1465,7 @@ bool IRBuilder::appendAlias(QQmlJS::AST::UiPublicMember *node) if (illegalNames.contains(propName)) error = tr("Illegal property name"); else - error = _object->appendAlias(alias, propName, node->isDefaultMember, node->defaultToken, &errorLocation); + error = _object->appendAlias(alias, propName, node->isDefaultMember(), node->defaultToken(), &errorLocation); if (!error.isEmpty()) { if (errorLocation.startLine == 0) |