diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-05-20 11:13:48 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-21 09:58:12 +0200 |
| commit | 07ebb1a0613e0eb9df17784af6f66d73ebee1061 (patch) | |
| tree | 51e83261836edf93e30c349a83bcafd5c6f0f589 /src/qml/types/qquickworkerscript.cpp | |
| parent | 75462746ab3afd892e7deca28c88ddf68da0a9c0 (diff) | |
Rename QV8Worker to QV4::Serialize
The class is only being used in WorkerScript, but in itself
only does serialization of JS Values.
Change-Id: Ibf1b06acf5abcfcc00cada9cc8cad9a833bd7ea3
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/types/qquickworkerscript.cpp')
| -rw-r--r-- | src/qml/types/qquickworkerscript.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp index 5d3a6f51b8..b62cd4d6fa 100644 --- a/src/qml/types/qquickworkerscript.cpp +++ b/src/qml/types/qquickworkerscript.cpp @@ -59,7 +59,7 @@ #include "qqmlnetworkaccessmanagerfactory.h" #include <private/qv8engine_p.h> -#include <private/qv8worker_p.h> +#include <private/qv4serialize_p.h> #include <private/qv4value_p.h> #include <private/qv4functionobject_p.h> @@ -281,7 +281,7 @@ QV4::Value QQuickWorkerScriptEnginePrivate::sendMessage(const v8::Arguments &arg int id = args[1]->Int32Value(); - QByteArray data = QV8Worker::serialize(args[2]->v4Value(), engine); + QByteArray data = QV4::Serialize::serialize(args[2]->v4Value(), engine); QMutexLocker locker(&engine->p->m_lock); WorkerScript *script = engine->p->workers.value(id); @@ -343,7 +343,7 @@ void QQuickWorkerScriptEnginePrivate::processMessage(int id, const QByteArray &d if (!script) return; - v8::Handle<v8::Value> value = QV8Worker::deserialize(data, workerEngine); + v8::Handle<v8::Value> value = QV4::Serialize::deserialize(data, workerEngine); v8::TryCatch tc; workerEngine->callOnMessage(script->object.value(), value); @@ -663,7 +663,7 @@ void QQuickWorkerScript::sendMessage(QQmlV4Function *args) if (args->length() != 0) argument = (*args)[0]; - m_engine->sendMessage(m_scriptId, QV8Worker::serialize(argument->v4Value(), args->engine())); + m_engine->sendMessage(m_scriptId, QV4::Serialize::serialize(argument->v4Value(), args->engine())); } void QQuickWorkerScript::classBegin() @@ -712,7 +712,7 @@ bool QQuickWorkerScript::event(QEvent *event) if (engine) { WorkerDataEvent *workerEvent = static_cast<WorkerDataEvent *>(event); QV8Engine *v8engine = QQmlEnginePrivate::get(engine)->v8engine(); - v8::Handle<v8::Value> value = QV8Worker::deserialize(workerEvent->data(), v8engine); + v8::Handle<v8::Value> value = QV4::Serialize::deserialize(workerEvent->data(), v8engine); emit message(QQmlV4Handle(value->v4Value())); } return true; |