aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/v8/qv8include.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-05-21 12:33:55 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2013-05-21 12:54:18 +0200
commitd8891234812898b1cab406dae9fab9f818bb1efe (patch)
tree24dfbdd53386ba7c97d4e17fb6c04c4b8c38e56a /src/qml/qml/v8/qv8include.cpp
parent15db69e5066a6535532744186e11f3098800f0ba (diff)
Get rid of v8::Integer
Change-Id: I6b9ab830c4ff3cbf986dbcf7c056648b5a16a222 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/v8/qv8include.cpp')
-rw-r--r--src/qml/qml/v8/qv8include.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/qml/v8/qv8include.cpp b/src/qml/qml/v8/qv8include.cpp
index 90c1f5928c..018aaf5823 100644
--- a/src/qml/qml/v8/qv8include.cpp
+++ b/src/qml/qml/v8/qv8include.cpp
@@ -81,12 +81,12 @@ v8::Handle<v8::Object> QV8Include::resultValue(Status status)
{
// XXX It seems inefficient to create this object from scratch each time.
v8::Handle<v8::Object> result = v8::Object::New();
- result->Set(v8::String::New("OK"), v8::Integer::New(Ok));
- result->Set(v8::String::New("LOADING"), v8::Integer::New(Loading));
- result->Set(v8::String::New("NETWORK_ERROR"), v8::Integer::New(NetworkError));
- result->Set(v8::String::New("EXCEPTION"), v8::Integer::New(Exception));
+ result->Set(v8::String::New("OK"), QV4::Value::fromInt32(Ok));
+ result->Set(v8::String::New("LOADING"), QV4::Value::fromInt32(Loading));
+ result->Set(v8::String::New("NETWORK_ERROR"), QV4::Value::fromInt32(NetworkError));
+ result->Set(v8::String::New("EXCEPTION"), QV4::Value::fromInt32(Exception));
- result->Set(v8::String::New("status"), v8::Integer::New(status));
+ result->Set(v8::String::New("status"), QV4::Value::fromInt32(status));
return result;
}
@@ -151,14 +151,14 @@ void QV8Include::finished()
//m_engine->contextWrapper()->addSubContext(m_qmlglobal.value(), script, importContext);
try {
script->Run(m_qmlglobal.value());
- v8::Handle<v8::Object>(m_resultObject)->Set(v8::String::New("status"), v8::Integer::New(Ok));
+ v8::Handle<v8::Object>(m_resultObject)->Set(v8::String::New("status"), QV4::Value::fromInt32(Ok));
} catch (QV4::Exception &e) {
e.accept(ctx);
- v8::Handle<v8::Object>(m_resultObject)->Set(v8::String::New("status"), v8::Integer::New(Exception));
+ v8::Handle<v8::Object>(m_resultObject)->Set(v8::String::New("status"), QV4::Value::fromInt32(Exception));
v8::Handle<v8::Object>(m_resultObject)->Set(v8::String::New("exception"), e.value());
}
} else {
- v8::Handle<v8::Object>(m_resultObject)->Set(v8::String::New("status"), v8::Integer::New(NetworkError));
+ v8::Handle<v8::Object>(m_resultObject)->Set(v8::String::New("status"), QV4::Value::fromInt32(NetworkError));
}
callback(m_engine, m_callbackFunction.value(), m_resultObject.value());