diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2022-05-04 16:14:29 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2022-05-11 12:56:22 +0200 |
| commit | 6be0db416b867d432a826556dfc00929ecd77aba (patch) | |
| tree | 3966880a9494f062c7f8468bedbc3ef5af3e65b6 /src/qml/compiler/qqmlirbuilder.cpp | |
| parent | 36ebee4e69182f0e44d87691d4740b271e1dcf38 (diff) | |
QML: Port QV4::CompiledData::Property to new special integer bitfield
Pick-to: 5.15 6.2 6.3
Task-number: QTBUG-99545
Change-Id: I46f9151536ba09417d117d690d7347bd91c13e75
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
Diffstat (limited to 'src/qml/compiler/qqmlirbuilder.cpp')
| -rw-r--r-- | src/qml/compiler/qqmlirbuilder.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp index c9e8cdf153..6dcf07d66c 100644 --- a/src/qml/compiler/qqmlirbuilder.cpp +++ b/src/qml/compiler/qqmlirbuilder.cpp @@ -78,7 +78,7 @@ void Object::simplifyRequiredProperties() { for (auto it = this->propertiesBegin(); it != this->propertiesEnd(); ++it) { auto requiredIt = required.find(it->nameIndex); if (requiredIt != required.end()) { - it->isRequired = true; + it->setIsRequired(true); required.erase(requiredIt); } } @@ -967,8 +967,8 @@ bool IRBuilder::visit(QQmlJS::AST::UiPublicMember *node) const QStringView &name = node->name; Property *property = New<Property>(); - property->isReadOnly = node->isReadonly(); - property->isRequired = node->isRequired(); + property->setIsReadOnly(node->isReadonly()); + property->setIsRequired(node->isRequired()); const QV4::CompiledData::BuiltinType builtinPropertyType = Parameter::stringToBuiltinType(memberType); @@ -979,7 +979,7 @@ bool IRBuilder::visit(QQmlJS::AST::UiPublicMember *node) const QStringView &typeModifier = node->typeModifier; if (typeModifier == QLatin1String("list")) { - property->isList = true; + property->setIsList(true); } else if (!typeModifier.isEmpty()) { recordError(node->typeModifierToken, QCoreApplication::translate("QQmlParser","Invalid property type modifier")); return false; @@ -1108,7 +1108,7 @@ void IRBuilder::setBindingValue(QV4::CompiledData::Binding *binding, QQmlJS::AST QQmlJS::SourceLocation loc = statement->firstSourceLocation(); binding->valueLocation.set(loc.startLine, loc.startColumn); binding->setType(QV4::CompiledData::Binding::Type_Invalid); - if (_propertyDeclaration && _propertyDeclaration->isReadOnly) + if (_propertyDeclaration && _propertyDeclaration->isReadOnly()) binding->setFlag(QV4::CompiledData::Binding::InitializerForReadOnlyDeclaration); QQmlJS::AST::ExpressionStatement *exprStmt = QQmlJS::AST::cast<QQmlJS::AST::ExpressionStatement *>(statement); @@ -1249,7 +1249,7 @@ void IRBuilder::appendBinding(const QQmlJS::SourceLocation &qualifiedNameLocatio binding->clearFlags(); - if (_propertyDeclaration && _propertyDeclaration->isReadOnly) + if (_propertyDeclaration && _propertyDeclaration->isReadOnly()) binding->setFlag(Binding::InitializerForReadOnlyDeclaration); // No type name on the initializer means it must be a group property @@ -1509,7 +1509,7 @@ bool IRBuilder::isStatementNodeScript(QQmlJS::AST::Statement *statement) bool IRBuilder::isRedundantNullInitializerForPropertyDeclaration(Property *property, QQmlJS::AST::Statement *statement) { - if (property->isBuiltinType || property->isList) + if (property->isBuiltinType() || property->isList()) return false; QQmlJS::AST::ExpressionStatement *exprStmt = QQmlJS::AST::cast<QQmlJS::AST::ExpressionStatement *>(statement); if (!exprStmt) |