diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-01-15 21:54:12 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2015-01-23 12:30:38 +0100 |
| commit | ef6b4938b9ec309d5faf0c966cb2b58f3de2ca77 (patch) | |
| tree | 3d946ad66defb1ec5c60a50e16b6e7883ec33862 /src/qml/jsruntime/qv4context.cpp | |
| parent | 3dbf4e9a6979802fff55e2f5e6aa54a14280e128 (diff) | |
Cleanups
Simplify some code in BooleanObject
Simplify access to call arguments and thisObject
Change-Id: I2f8e844019bc587385608beb02f05b15f827535c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4context.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4context.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp index 27d32bbcd3..8c637472a7 100644 --- a/src/qml/jsruntime/qv4context.cpp +++ b/src/qml/jsruntime/qv4context.cpp @@ -246,7 +246,7 @@ bool ExecutionContext::deleteProperty(String *name) bool CallContext::needsOwnArguments() const { - return d()->function->needsActivation() || d()->callData->argc < static_cast<int>(d()->function->formalParameterCount()); + return d()->function->needsActivation() || argc() < static_cast<int>(d()->function->formalParameterCount()); } void ExecutionContext::markObjects(Heap::Base *m, ExecutionEngine *engine) @@ -346,7 +346,7 @@ ReturnedValue ExecutionContext::getProperty(String *name) name->makeIdentifier(scope.engine); if (name->equals(d()->engine->id_this)) - return d()->callData->thisObject.asReturnedValue(); + return thisObject().asReturnedValue(); bool hasWith = false; bool hasCatchScope = false; @@ -413,7 +413,7 @@ ReturnedValue ExecutionContext::getPropertyAndBase(String *name, Heap::Object ** name->makeIdentifier(scope.engine); if (name->equals(d()->engine->id_this)) - return d()->callData->thisObject.asReturnedValue(); + return thisObject().asReturnedValue(); bool hasWith = false; bool hasCatchScope = false; |