diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-05-06 15:57:06 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-06 16:10:21 +0200 |
commit | 8b5fbb56299851896fbcf136bdcfdcd4487484b5 (patch) | |
tree | 16a5a586d2dbe0b8e6d60b0ba76803dcce2560db /src/qml/qml/v8/qv8variantwrapper.cpp | |
parent | 19c6f620dd35916466c36234231d798f79732ab0 (diff) |
Get rid of v8::Local
The class was doing exactly the same thing as v8::Handle
in our implementation. Removing it cleans up quite a bit
of code.
Change-Id: I37a3dcdef062fc388751e9ef0a158b5926ba2efb
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/v8/qv8variantwrapper.cpp')
-rw-r--r-- | src/qml/qml/v8/qv8variantwrapper.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/qml/qml/v8/qv8variantwrapper.cpp b/src/qml/qml/v8/qv8variantwrapper.cpp index bea016a905..ebe24c51ae 100644 --- a/src/qml/qml/v8/qv8variantwrapper.cpp +++ b/src/qml/qml/v8/qv8variantwrapper.cpp @@ -87,7 +87,7 @@ void QV8VariantWrapper::init(QV8Engine *engine) m_valueOf = qPersistentNew<v8::Function>(v8::FunctionTemplate::New(ValueOf)->GetFunction()); { - v8::Local<v8::FunctionTemplate> ft = v8::FunctionTemplate::New(); + v8::Handle<v8::FunctionTemplate> ft = v8::FunctionTemplate::New(); ft->InstanceTemplate()->SetFallbackPropertyHandler(Getter, Setter); ft->InstanceTemplate()->SetHasExternalResource(true); ft->InstanceTemplate()->MarkAsUseUserObjectComparison(); @@ -102,7 +102,7 @@ void QV8VariantWrapper::init(QV8Engine *engine) { m_preserve = qPersistentNew<v8::Function>(v8::FunctionTemplate::New(Preserve)->GetFunction()); m_destroy = qPersistentNew<v8::Function>(v8::FunctionTemplate::New(Destroy)->GetFunction()); - v8::Local<v8::FunctionTemplate> ft = v8::FunctionTemplate::New(); + v8::Handle<v8::FunctionTemplate> ft = v8::FunctionTemplate::New(); ft->InstanceTemplate()->SetFallbackPropertyHandler(Getter, Setter); ft->InstanceTemplate()->SetHasExternalResource(true); ft->InstanceTemplate()->MarkAsUseUserObjectComparison(); @@ -133,13 +133,13 @@ void QV8VariantWrapper::destroy() qPersistentDispose(m_constructor); } -v8::Local<v8::Object> QV8VariantWrapper::newVariant(const QVariant &value) +v8::Handle<v8::Object> QV8VariantWrapper::newVariant(const QVariant &value) { bool scarceResource = value.type() == QVariant::Pixmap || value.type() == QVariant::Image; // XXX NewInstance() should be optimized - v8::Local<v8::Object> rv; + v8::Handle<v8::Object> rv; QV8VariantResource *r = new QV8VariantResource(m_engine, value); if (scarceResource) { @@ -180,41 +180,41 @@ QVariant &QV8VariantWrapper::variantValue(v8::Handle<v8::Value> value) return static_cast<QV8VariantResource *>(r)->data; } -v8::Handle<v8::Value> QV8VariantWrapper::Getter(v8::Local<v8::String> /* property */, +v8::Handle<v8::Value> QV8VariantWrapper::Getter(v8::Handle<v8::String> /* property */, const v8::AccessorInfo & /* info */) { return v8::Handle<v8::Value>(); } -v8::Handle<v8::Value> QV8VariantWrapper::Setter(v8::Local<v8::String> /* property */, - v8::Local<v8::Value> value, +v8::Handle<v8::Value> QV8VariantWrapper::Setter(v8::Handle<v8::String> /* property */, + v8::Handle<v8::Value> value, const v8::AccessorInfo & /* info */) { return value; } -v8::Handle<v8::Value> QV8VariantWrapper::PreserveGetter(v8::Local<v8::String> property, +v8::Handle<v8::Value> QV8VariantWrapper::PreserveGetter(v8::Handle<v8::String> property, const v8::AccessorInfo &info) { Q_UNUSED(property); return info.Data(); } -v8::Handle<v8::Value> QV8VariantWrapper::DestroyGetter(v8::Local<v8::String> property, +v8::Handle<v8::Value> QV8VariantWrapper::DestroyGetter(v8::Handle<v8::String> property, const v8::AccessorInfo &info) { Q_UNUSED(property); return info.Data(); } -v8::Handle<v8::Value> QV8VariantWrapper::ToStringGetter(v8::Local<v8::String> property, +v8::Handle<v8::Value> QV8VariantWrapper::ToStringGetter(v8::Handle<v8::String> property, const v8::AccessorInfo &info) { Q_UNUSED(property); return info.Data(); } -v8::Handle<v8::Value> QV8VariantWrapper::ValueOfGetter(v8::Local<v8::String> property, +v8::Handle<v8::Value> QV8VariantWrapper::ValueOfGetter(v8::Handle<v8::String> property, const v8::AccessorInfo &info) { Q_UNUSED(property); |