aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlcomponent.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-09-25 12:24:36 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-28 13:33:24 +0200
commitcf2a253f2f60c9f0c61682527d80143e72b355d4 (patch)
treed60e8be50437e6f15513e25155817b902a2062c7 /src/qml/qml/qqmlcomponent.cpp
parent7872b380063d0497ba62fecfdc92148f1ea947af (diff)
Move Value::fromBool, ... to a new Primitive class
This will simplify finding the remaining direct usages of QV4::Value that need fixing. Change-Id: I223099727436d5748027c84c53d9dfc4028e38ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlcomponent.cpp')
-rw-r--r--src/qml/qml/qqmlcomponent.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index de1114a15e..6c7bdb7e90 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -1208,7 +1208,7 @@ void QQmlComponent::createObject(QQmlV4Function *args)
QObject *parent = 0;
QV4::ExecutionEngine *v4 = args->v4engine();
QV4::Scope scope(v4);
- QV4::ScopedValue valuemap(scope, QV4::Value::undefinedValue());
+ QV4::ScopedValue valuemap(scope, QV4::Primitive::undefinedValue());
if (args->length() >= 1) {
QV4::Scoped<QV4::QObjectWrapper> qobjectWrapper(scope, (*args)[0]);
@@ -1333,7 +1333,7 @@ void QQmlComponent::incubateObject(QQmlV4Function *args)
QV4::Scope scope(v4);
QObject *parent = 0;
- QV4::ScopedValue valuemap(scope, QV4::Value::undefinedValue());
+ QV4::ScopedValue valuemap(scope, QV4::Primitive::undefinedValue());
QQmlIncubator::IncubationMode mode = QQmlIncubator::Asynchronous;
if (args->length() >= 1) {
@@ -1485,9 +1485,9 @@ QmlIncubatorObject::QmlIncubatorObject(QV8Engine *engine, IncubationMode m)
v8 = engine;
vtbl = &static_vtbl;
- valuemap = QV4::Value::undefinedValue();
- qmlGlobal = QV4::Value::undefinedValue();
- m_statusChanged = QV4::Value::undefinedValue();
+ valuemap = QV4::Primitive::undefinedValue();
+ qmlGlobal = QV4::Primitive::undefinedValue();
+ m_statusChanged = QV4::Primitive::undefinedValue();
}
void QmlIncubatorObject::setInitialState(QObject *o)
@@ -1541,7 +1541,7 @@ void QmlIncubatorObject::statusChanged(Status s)
try {
QV4::ScopedCallData callData(scope, 1);
callData->thisObject = QV4::Value::fromObject(this);
- callData->args[0] = QV4::Value::fromUInt32(s);
+ callData->args[0] = QV4::Primitive::fromUInt32(s);
f->call(callData);
} catch (QV4::Exception &e) {
e.accept(ctx);