diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-06-03 15:59:00 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-03 16:02:24 +0200 |
commit | 975e10fca2429bf8799ed6083035a903a908821b (patch) | |
tree | 07c022b042dd29486bef4f732037fee4435ba486 /src/qml/types/qquickworkerscript.cpp | |
parent | 4a9e733b2c21476fc4b2609bc1115cf71a3c67f1 (diff) |
Remove some more v8 usage
Change-Id: I00c4a2403e12bc87743a073f245c38b007e9531d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/types/qquickworkerscript.cpp')
-rw-r--r-- | src/qml/types/qquickworkerscript.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp index daaa9e2767..f05d8e4e9b 100644 --- a/src/qml/types/qquickworkerscript.cpp +++ b/src/qml/types/qquickworkerscript.cpp @@ -180,7 +180,7 @@ public: int m_nextId; - static QV4::Value sendMessage(const v8::Arguments &args); + static QV4::Value sendMessage(QV4::SimpleCallContext *ctx); signals: void stopThread(); @@ -231,7 +231,8 @@ void QQuickWorkerScriptEnginePrivate::WorkerEngine::init() QV4::FunctionObject *createsendconstructor = createsendscript.run().asFunctionObject(); QV4::Value args[] = { - V8FUNCTION(QQuickWorkerScriptEnginePrivate::sendMessage, this)->v4Value() + QV4::Value::fromObject(m_v4Engine->newBuiltinFunction(m_v4Engine->rootContext, m_v4Engine->newString(QStringLiteral("sendMessage")), + QQuickWorkerScriptEnginePrivate::sendMessage)) }; createsend = createsendconstructor->call(global(), args, 1); } @@ -269,13 +270,13 @@ QQuickWorkerScriptEnginePrivate::QQuickWorkerScriptEnginePrivate(QQmlEngine *eng { } -QV4::Value QQuickWorkerScriptEnginePrivate::sendMessage(const v8::Arguments &args) +QV4::Value QQuickWorkerScriptEnginePrivate::sendMessage(QV4::SimpleCallContext *ctx) { - WorkerEngine *engine = (WorkerEngine*)V8ENGINE(); + WorkerEngine *engine = (WorkerEngine*)ctx->engine->publicEngine->handle(); - int id = args[1]->Int32Value(); + int id = ctx->argument(1).toInt32(); - QByteArray data = QV4::Serialize::serialize(args[2]->v4Value(), engine); + QByteArray data = QV4::Serialize::serialize(ctx->argument(2), engine); QMutexLocker locker(&engine->p->m_lock); WorkerScript *script = engine->p->workers.value(id); |