diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-01-15 21:28:01 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2015-01-23 12:30:35 +0100 |
| commit | 3dbf4e9a6979802fff55e2f5e6aa54a14280e128 (patch) | |
| tree | 2bd9090f4bcf01e9c9e43c0d52fcbf80295ca6c0 /src/qml/jsruntime/qv4context.cpp | |
| parent | 3f3652e43fc001df728ef00403b18d3202e2726a (diff) | |
Cleanups
Remove duplicated methods. Remove some mostly unused methods,
and simplify some others.
Change-Id: I605b249e54417bb32c3dfc8e22f2c8b6b684a1e1
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4context.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4context.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp index 3db957c9bb..27d32bbcd3 100644 --- a/src/qml/jsruntime/qv4context.cpp +++ b/src/qml/jsruntime/qv4context.cpp @@ -358,7 +358,7 @@ ReturnedValue ExecutionContext::getProperty(String *name) bool hasProperty = false; v = w->get(name, &hasProperty); if (hasProperty) { - return v.asReturnedValue(); + return v->asReturnedValue(); } continue; } @@ -386,7 +386,7 @@ ReturnedValue ExecutionContext::getProperty(String *name) bool hasProperty = false; v = activation->get(name, &hasProperty); if (hasProperty) - return v.asReturnedValue(); + return v->asReturnedValue(); } if (f->function() && f->function()->isNamedExpression() && name->equals(ScopedString(scope, f->function()->name()))) @@ -398,7 +398,7 @@ ReturnedValue ExecutionContext::getProperty(String *name) bool hasProperty = false; v = global->get(name, &hasProperty); if (hasProperty) - return v.asReturnedValue(); + return v->asReturnedValue(); } } ScopedValue n(scope, name); @@ -426,7 +426,7 @@ ReturnedValue ExecutionContext::getPropertyAndBase(String *name, Heap::Object ** v = w->get(name, &hasProperty); if (hasProperty) { *base = w->d(); - return v.asReturnedValue(); + return v->asReturnedValue(); } continue; } @@ -456,7 +456,7 @@ ReturnedValue ExecutionContext::getPropertyAndBase(String *name, Heap::Object ** if (hasProperty) { if (ctx->d()->type == Heap::ExecutionContext::Type_QmlContext) *base = activation->d(); - return v.asReturnedValue(); + return v->asReturnedValue(); } } if (f->function() && f->function()->isNamedExpression() @@ -469,7 +469,7 @@ ReturnedValue ExecutionContext::getPropertyAndBase(String *name, Heap::Object ** bool hasProperty = false; v = global->get(name, &hasProperty); if (hasProperty) - return v.asReturnedValue(); + return v->asReturnedValue(); } } ScopedValue n(scope, name); |