aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/compiler/qqmlirbuilder.cpp
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2022-05-05 11:23:03 +0200
committerUlf Hermann <ulf.hermann@qt.io>2022-05-11 12:56:21 +0200
commit8d03b13a59a5e3866c982eb14ca2dc57b687d218 (patch)
tree0a93eae7d9f55e77bcf4702c469e068f618e259b /src/qml/compiler/qqmlirbuilder.cpp
parent745cce4391a8b6255605cb304d8bc14b11168423 (diff)
QML: Port QV4::CompiledData::Alias to new special integer bitfield
Pick-to: 5.15 6.2 6.3 Task-number: QTBUG-99545 Change-Id: I554f9f903a39a83eaf601fd4fd932f685bf343d0 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.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index 1b0ecacdf3..c5453968ba 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -246,7 +246,7 @@ QString Object::appendProperty(Property *prop, const QString &propertyName, bool
return tr("Duplicate property name");
for (Alias *a = target->aliases->first; a; a = a->next)
- if (a->nameIndex == prop->nameIndex)
+ if (a->nameIndex() == prop->nameIndex)
return tr("Property duplicates alias name");
if (propertyName.constData()->isUpper())
@@ -270,13 +270,13 @@ QString Object::appendAlias(Alias *alias, const QString &aliasName, bool isDefau
target = this;
const auto aliasWithSameName = std::find_if(target->aliases->begin(), target->aliases->end(), [&alias](const Alias &targetAlias){
- return targetAlias.nameIndex == alias->nameIndex;
+ return targetAlias.nameIndex() == alias->nameIndex();
});
if (aliasWithSameName != target->aliases->end())
return tr("Duplicate alias name");
const auto aliasSameAsProperty = std::find_if(target->properties->begin(), target->properties->end(), [&alias](const Property &targetProp){
- return targetProp.nameIndex == alias->nameIndex;
+ return targetProp.nameIndex == alias->nameIndex();
});
if (aliasSameAsProperty != target->properties->end())
@@ -1282,12 +1282,12 @@ void IRBuilder::appendBinding(const QQmlJS::SourceLocation &qualifiedNameLocatio
bool IRBuilder::appendAlias(QQmlJS::AST::UiPublicMember *node)
{
Alias *alias = New<Alias>();
- alias->flags = 0;
+ alias->clearFlags();
if (node->isReadonly())
- alias->flags |= QV4::CompiledData::Alias::IsReadOnly;
+ alias->setFlag(QV4::CompiledData::Alias::IsReadOnly);
const QString propName = node->name.toString();
- alias->nameIndex = registerString(propName);
+ alias->setNameIndex(registerString(propName));
QQmlJS::SourceLocation loc = node->firstSourceLocation();
alias->location.line = loc.startLine;