From f9bddfa12d233d9ef01299869f4d491d62a0828e Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Mon, 15 Nov 2021 11:45:14 +0100 Subject: 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 Reviewed-by: Ulf Hermann --- src/qml/compiler/qqmlirbuilder.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/qml/compiler/qqmlirbuilder.cpp') 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->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->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) -- cgit v1.2.3