diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-06-23 22:25:53 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-07-02 19:29:40 +0000 |
| commit | 86f88521fbea59e8ec53e50cc1e3e68a61f53c40 (patch) | |
| tree | 25f72eaf70639409d3c8a8469a05b7be0a0da03b /src/qml/jsruntime/qv4context.cpp | |
| parent | 8728a2b494eb384b65bd4e7c6ec785435a37de9d (diff) | |
Replace Identifier by PropertyKey
Change all uses of Identifier to use the new PropertyKey class
and get rid of Identifier.
Change-Id: Ib7e83b06a3c923235e145b6e083fe980dc240452
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4context.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4context.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp index 0ae79c8b36..f01ec33c64 100644 --- a/src/qml/jsruntime/qv4context.cpp +++ b/src/qml/jsruntime/qv4context.cpp @@ -178,7 +178,7 @@ void ExecutionContext::createMutableBinding(String *name, bool deletable) ctx = ctx->d()->outer; } - Identifier id = name->toPropertyKey(); + PropertyKey id = name->toPropertyKey(); if (activation->getOwnProperty(id) != Attr_Invalid) return; ScopedProperty desc(scope); @@ -191,7 +191,7 @@ void ExecutionContext::createMutableBinding(String *name, bool deletable) bool ExecutionContext::deleteProperty(String *name) { name->makeIdentifier(); - Identifier id = name->identifier(); + PropertyKey id = name->identifier(); Heap::ExecutionContext *ctx = d(); for (; ctx; ctx = ctx->outer) { @@ -227,7 +227,7 @@ bool ExecutionContext::deleteProperty(String *name) ExecutionContext::Error ExecutionContext::setProperty(String *name, const Value &value) { name->makeIdentifier(); - Identifier id = name->identifier(); + PropertyKey id = name->identifier(); QV4::ExecutionEngine *v4 = engine(); Heap::ExecutionContext *ctx = d(); @@ -290,7 +290,7 @@ ReturnedValue ExecutionContext::getProperty(String *name) case Heap::ExecutionContext::Type_BlockContext: case Heap::ExecutionContext::Type_CallContext: { Heap::CallContext *c = static_cast<Heap::CallContext *>(ctx); - Identifier id = name->identifier(); + PropertyKey id = name->identifier(); uint index = c->internalClass->find(id); if (index < UINT_MAX) @@ -327,7 +327,7 @@ ReturnedValue ExecutionContext::getPropertyAndBase(String *name, Value *base) case Heap::ExecutionContext::Type_CallContext: { Heap::CallContext *c = static_cast<Heap::CallContext *>(ctx); name->makeIdentifier(); - Identifier id = name->identifier(); + PropertyKey id = name->identifier(); uint index = c->internalClass->find(id); if (index < UINT_MAX) |