aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/v8/qjsengine.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-04-19 13:03:42 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2013-04-19 13:09:28 +0200
commit8fb620db43bb861ea7950e7176106e8aaf00876b (patch)
treeecd8dbd43edca86b5acff953b3d924227e80e458 /src/qml/qml/v8/qjsengine.cpp
parent9f8c2e733202ea2bcfbc6182fe1e994b140f449a (diff)
Rename QQmlJS::VM namespace to QV4
Simplifies writing code against it (less stuff to type). Change-Id: I8ac03ca2519375a204a3245e82c4be4cf1e793eb Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/v8/qjsengine.cpp')
-rw-r--r--src/qml/qml/v8/qjsengine.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/qml/v8/qjsengine.cpp b/src/qml/qml/v8/qjsengine.cpp
index 6a9fe326ac..5baf7513e2 100644
--- a/src/qml/qml/v8/qjsengine.cpp
+++ b/src/qml/qml/v8/qjsengine.cpp
@@ -258,14 +258,14 @@ void QJSEngine::collectGarbage()
QJSValue QJSEngine::evaluate(const QString& program, const QString& fileName, int lineNumber)
{
try {
- QQmlJS::VM::Function *f = QQmlJS::VM::EvalFunction::parseSource(d->m_v4Engine->current, fileName, program, QQmlJS::Codegen::EvalCode,
+ QV4::Function *f = QV4::EvalFunction::parseSource(d->m_v4Engine->current, fileName, program, QQmlJS::Codegen::EvalCode,
d->m_v4Engine->current->strictMode, true);
if (!f)
return new QJSValuePrivate(d->m_v4Engine, d->m_v4Engine->newSyntaxErrorObject(d->m_v4Engine->current, 0));
- QQmlJS::VM::Value result = d->m_v4Engine->run(f);
+ QV4::Value result = d->m_v4Engine->run(f);
return new QJSValuePrivate(d->m_v4Engine, result);
- } catch (QQmlJS::VM::Exception& ex) {
+ } catch (QV4::Exception& ex) {
ex.accept(d->m_v4Engine->current);
return new QJSValuePrivate(d->m_v4Engine, ex.value());
}
@@ -291,7 +291,7 @@ QJSValue QJSEngine::newObject()
*/
QJSValue QJSEngine::newArray(uint length)
{
- QQmlJS::VM::ArrayObject *array = d->m_v4Engine->newArrayObject(d->m_v4Engine->current);
+ QV4::ArrayObject *array = d->m_v4Engine->newArrayObject(d->m_v4Engine->current);
array->setArrayLength(length);
return new QJSValuePrivate(d->m_v4Engine, array);
}
@@ -359,7 +359,7 @@ QJSValue QJSEngine::create(int type, const void *ptr)
bool QJSEngine::convertV2(const QJSValue &value, int type, void *ptr)
{
QJSValuePrivate *vp = QJSValuePrivate::get(value);
- QQmlJS::VM::ExecutionEngine *e = vp->engine;
+ QV4::ExecutionEngine *e = vp->engine;
QV8Engine *engine = e ? QV8Engine::get(e->publicEngine) : 0;
if (engine) {
return engine->metaTypeFromJS(vp->getValue(engine->m_v4Engine), type, ptr);