diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-05-06 15:57:06 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-06 16:10:21 +0200 |
commit | 8b5fbb56299851896fbcf136bdcfdcd4487484b5 (patch) | |
tree | 16a5a586d2dbe0b8e6d60b0ba76803dcce2560db /src/qml/types/qquickworkerscript.cpp | |
parent | 19c6f620dd35916466c36234231d798f79732ab0 (diff) |
Get rid of v8::Local
The class was doing exactly the same thing as v8::Handle
in our implementation. Removing it cleans up quite a bit
of code.
Change-Id: I37a3dcdef062fc388751e9ef0a158b5926ba2efb
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/types/qquickworkerscript.cpp')
-rw-r--r-- | src/qml/types/qquickworkerscript.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp index 2fce25b0fc..e6c0e7d349 100644 --- a/src/qml/types/qquickworkerscript.cpp +++ b/src/qml/types/qquickworkerscript.cpp @@ -141,7 +141,7 @@ public: QQuickWorkerScriptEnginePrivate *p; - v8::Local<v8::Function> sendFunction(int id); + v8::Handle<v8::Function> sendFunction(int id); void callOnMessage(v8::Handle<v8::Object> object, v8::Handle<v8::Value> arg); private: v8::Persistent<v8::Function> onmessage; @@ -224,27 +224,27 @@ void QQuickWorkerScriptEnginePrivate::WorkerEngine::init() "})" { - v8::Local<v8::Script> onmessagescript = v8::Script::New(v8::String::New(CALL_ONMESSAGE_SCRIPT)); + v8::Handle<v8::Script> onmessagescript = v8::Script::New(v8::String::New(CALL_ONMESSAGE_SCRIPT)); onmessage = qPersistentNew<v8::Function>(v8::Handle<v8::Function>::Cast(onmessagescript->Run())); } { - v8::Local<v8::Script> createsendscript = v8::Script::New(v8::String::New(SEND_MESSAGE_CREATE_SCRIPT)); - v8::Local<v8::Function> createsendconstructor = v8::Local<v8::Function>::Cast(createsendscript->Run()); + v8::Handle<v8::Script> createsendscript = v8::Script::New(v8::String::New(SEND_MESSAGE_CREATE_SCRIPT)); + v8::Handle<v8::Function> createsendconstructor = v8::Handle<v8::Function>::Cast(createsendscript->Run()); v8::Handle<v8::Value> args[] = { V8FUNCTION(QQuickWorkerScriptEnginePrivate::sendMessage, this) }; - v8::Local<v8::Value> createsendvalue = createsendconstructor->Call(v8::Value::fromV4Value(global()), 1, args); + v8::Handle<v8::Value> createsendvalue = createsendconstructor->Call(v8::Value::fromV4Value(global()), 1, args); createsend = qPersistentNew<v8::Function>(v8::Handle<v8::Function>::Cast(createsendvalue)); } } // Requires handle and context scope -v8::Local<v8::Function> QQuickWorkerScriptEnginePrivate::WorkerEngine::sendFunction(int id) +v8::Handle<v8::Function> QQuickWorkerScriptEnginePrivate::WorkerEngine::sendFunction(int id) { v8::Handle<v8::Value> args[] = { v8::Integer::New(id) }; - return v8::Local<v8::Function>::Cast(createsend->Call(v8::Value::fromV4Value(global()), 1, args)); + return v8::Handle<v8::Function>::Cast(createsend->Call(v8::Value::fromV4Value(global()), 1, args)); } // Requires handle and context scope @@ -301,7 +301,7 @@ v8::Handle<v8::Object> QQuickWorkerScriptEnginePrivate::getWorker(WorkerScript * workerEngine->contextWrapper()->setReadOnly(script->object, false); - v8::Local<v8::Object> api = v8::Object::New(); + v8::Handle<v8::Object> api = v8::Object::New(); api->Set(v8::String::New("sendMessage"), workerEngine->sendFunction(script->id)); script->object->Set(v8::String::New("WorkerScript"), api); @@ -377,7 +377,7 @@ void QQuickWorkerScriptEnginePrivate::processLoad(int id, const QUrl &url) // workerEngine->baseUrl = url; v8::TryCatch tc; - v8::Local<v8::Script> program = workerEngine->qmlModeCompile(sourceCode, url.toString()); + v8::Handle<v8::Script> program = workerEngine->qmlModeCompile(sourceCode, url.toString()); if (!tc.HasCaught()) program->Run(activation); |