aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4globalobject.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-09-26 12:08:03 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-28 13:33:50 +0200
commitc0e0e9ba2c1dd8c3a2a590849ff244987730d1b2 (patch)
tree62fae7b90d95c202e39b6f40059151f3e29e82c6 /src/qml/jsruntime/qv4globalobject.cpp
parentd2e2a5b59c617e6cf7236cf36e9c20fe9ea36fdb (diff)
Fix API for evalCall()
Change-Id: Ib80b18348e18eb93044a73358f0c4e266b988f63 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4globalobject.cpp')
-rw-r--r--src/qml/jsruntime/qv4globalobject.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4globalobject.cpp b/src/qml/jsruntime/qv4globalobject.cpp
index 856b85cc1c..cbf6ddc1c6 100644
--- a/src/qml/jsruntime/qv4globalobject.cpp
+++ b/src/qml/jsruntime/qv4globalobject.cpp
@@ -354,9 +354,9 @@ EvalFunction::EvalFunction(ExecutionContext *scope)
defineReadonlyProperty(scope->engine->id_length, Primitive::fromInt32(1));
}
-ReturnedValue EvalFunction::evalCall(Value /*thisObject*/, Value *args, int argc, bool directCall)
+ReturnedValue EvalFunction::evalCall(CallData *callData, bool directCall)
{
- if (argc < 1)
+ if (callData->argc < 1)
return Encode::undefined();
ExecutionContext *parentContext = engine()->current;
@@ -370,10 +370,10 @@ ReturnedValue EvalFunction::evalCall(Value /*thisObject*/, Value *args, int argc
ctx = engine->pushGlobalContext();
}
- if (!args[0].isString())
- return args[0].asReturnedValue();
+ if (!callData->args[0].isString())
+ return callData->args[0].asReturnedValue();
- const QString code = args[0].stringValue()->toQString();
+ const QString code = callData->args[0].stringValue()->toQString();
bool inheritContext = !ctx->strictMode;
Script script(ctx, code, QString("eval code"));
@@ -436,7 +436,7 @@ ReturnedValue EvalFunction::call(Managed *that, CallData *callData)
{
// indirect call
// ### const_cast
- return static_cast<EvalFunction *>(that)->evalCall(callData->thisObject, const_cast<Value *>(static_cast<const Value *>(callData->args)), callData->argc, false);
+ return static_cast<EvalFunction *>(that)->evalCall(callData, false);
}