diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-07 11:22:52 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@digia.com> | 2013-05-07 12:28:58 +0200 |
commit | 5963aead75991ea8b0fded251e18ef75f099ab8f (patch) | |
tree | 17d6fdcb52fc1d59fa2ab3037121c679b9dd20aa /src/qml/qml/v8/qv8sequencewrapper.cpp | |
parent | 40d2e435cfa29ba7465adc0486e6dabcdfc49773 (diff) |
More steps towards eliminating the v8 layer
* Changed the return type of the InvocationCallback from a v8 handle to a QV4::Value
* Removed v4 auto tests and fixed build of other tests
Change-Id: Ic927b925923ca8785170689a5c260969fd1cb794
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/v8/qv8sequencewrapper.cpp')
-rw-r--r-- | src/qml/qml/v8/qv8sequencewrapper.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/qml/v8/qv8sequencewrapper.cpp b/src/qml/qml/v8/qv8sequencewrapper.cpp index 3f72697d9a..c4579fd73c 100644 --- a/src/qml/qml/v8/qv8sequencewrapper.cpp +++ b/src/qml/qml/v8/qv8sequencewrapper.cpp @@ -265,7 +265,7 @@ v8::Handle<v8::Value> QV8SequenceWrapper::SortGetter(v8::Handle<v8::String> prop return info.Data(); } -v8::Handle<v8::Value> QV8SequenceWrapper::Sort(const v8::Arguments &args) +QV4::Value QV8SequenceWrapper::Sort(const v8::Arguments &args) { int argCount = args.Length(); @@ -283,24 +283,24 @@ v8::Handle<v8::Value> QV8SequenceWrapper::Sort(const v8::Arguments &args) } } - return args.This(); + return args.This()->v4Value(); } -v8::Handle<v8::Value> QV8SequenceWrapper::ToString(const v8::Arguments &args) +QV4::Value QV8SequenceWrapper::ToString(const v8::Arguments &args) { QV8SequenceResource *sr = v8_resource_cast<QV8SequenceResource>(args.This()); Q_ASSERT(sr); return sr->toString(); } -v8::Handle<v8::Value> QV8SequenceWrapper::ValueOf(const v8::Arguments &args) +QV4::Value QV8SequenceWrapper::ValueOf(const v8::Arguments &args) { QV8SequenceResource *sr = v8_resource_cast<QV8SequenceResource>(args.This()); Q_ASSERT(sr); - v8::Handle<v8::Value> tostringValue = sr->toString(); - if (!tostringValue.IsEmpty()) + QV4::Value tostringValue = sr->toString(); + if (!tostringValue.isUndefined()) return tostringValue; - return v8::Integer::NewFromUnsigned(sr->lengthGetter()); + return QV4::Value::fromUInt32(sr->lengthGetter()); } v8::Handle<v8::Value> QV8SequenceWrapper::Getter(v8::Handle<v8::String> property, |