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/util | |
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/util')
-rw-r--r-- | src/qml/util/qqmladaptormodel.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/qml/util/qqmladaptormodel.cpp b/src/qml/util/qqmladaptormodel.cpp index 18e413776c..6c1c593e93 100644 --- a/src/qml/util/qqmladaptormodel.cpp +++ b/src/qml/util/qqmladaptormodel.cpp @@ -62,9 +62,9 @@ public: QQmlAdaptorModelEngineData(QV8Engine *engine); ~QQmlAdaptorModelEngineData(); - v8::Local<v8::String> index() { return strings->Get(Index)->ToString(); } - v8::Local<v8::String> modelData() { return strings->Get(ModelData)->ToString(); } - v8::Local<v8::String> hasModelChildren() { return strings->Get(HasModelChildren)->ToString(); } + v8::Handle<v8::String> index() { return strings->Get(Index)->ToString(); } + v8::Handle<v8::String> modelData() { return strings->Get(ModelData)->ToString(); } + v8::Handle<v8::String> hasModelChildren() { return strings->Get(HasModelChildren)->ToString(); } v8::Persistent<v8::Function> constructorListItem; v8::Persistent<v8::Array> strings; @@ -72,7 +72,7 @@ public: V8_DEFINE_EXTENSION(QQmlAdaptorModelEngineData, engineData) -static v8::Handle<v8::Value> get_index(v8::Local<v8::String>, const v8::AccessorInfo &info) +static v8::Handle<v8::Value> get_index(v8::Handle<v8::String>, const v8::AccessorInfo &info) { QQmlDelegateModelItem *data = v8_resource_cast<QQmlDelegateModelItem>(info.This()); V8ASSERT_TYPE(data, "Not a valid VisualData object"); @@ -115,9 +115,9 @@ public: void setValue(const QString &role, const QVariant &value); bool resolveIndex(const QQmlAdaptorModel &model, int idx); - static v8::Handle<v8::Value> get_property(v8::Local<v8::String>, const v8::AccessorInfo &info); + static v8::Handle<v8::Value> get_property(v8::Handle<v8::String>, const v8::AccessorInfo &info); static void set_property( - v8::Local<v8::String>, v8::Local<v8::Value> value, const v8::AccessorInfo &info); + v8::Handle<v8::String>, v8::Handle<v8::Value> value, const v8::AccessorInfo &info); VDMModelDelegateDataType *type; QVector<QVariant> cachedData; @@ -331,7 +331,7 @@ bool QQmlDMCachedModelData::resolveIndex(const QQmlAdaptorModel &, int idx) } v8::Handle<v8::Value> QQmlDMCachedModelData::get_property( - v8::Local<v8::String>, const v8::AccessorInfo &info) + v8::Handle<v8::String>, const v8::AccessorInfo &info) { QQmlDelegateModelItem *data = v8_resource_cast<QQmlDelegateModelItem>(info.This()); V8ASSERT_TYPE(data, "Not a valid VisualData object"); @@ -351,7 +351,7 @@ v8::Handle<v8::Value> QQmlDMCachedModelData::get_property( } void QQmlDMCachedModelData::set_property( - v8::Local<v8::String>, v8::Local<v8::Value> value, const v8::AccessorInfo &info) + v8::Handle<v8::String>, v8::Handle<v8::Value> value, const v8::AccessorInfo &info) { QQmlDelegateModelItem *data = v8_resource_cast<QQmlDelegateModelItem>(info.This()); V8ASSERT_TYPE_SETTER(data, "Not a valid VisualData object"); @@ -417,13 +417,13 @@ public: type->initializeConstructor(data); type->constructor->SetAccessor(data->hasModelChildren(), get_hasModelChildren); } - v8::Local<v8::Object> data = type->constructor->NewInstance(); + v8::Handle<v8::Object> data = type->constructor->NewInstance(); data->SetExternalResource(this); ++scriptRef; return data; } - static v8::Handle<v8::Value> get_hasModelChildren(v8::Local<v8::String>, const v8::AccessorInfo &info) + static v8::Handle<v8::Value> get_hasModelChildren(v8::Handle<v8::String>, const v8::AccessorInfo &info) { QQmlDelegateModelItem *data = v8_resource_cast<QQmlDelegateModelItem>(info.This()); V8ASSERT_TYPE(data, "Not a valid VisualData object"); @@ -580,7 +580,7 @@ public: } } - static v8::Handle<v8::Value> get_modelData(v8::Local<v8::String>, const v8::AccessorInfo &info) + static v8::Handle<v8::Value> get_modelData(v8::Handle<v8::String>, const v8::AccessorInfo &info) { QQmlDelegateModelItem *data = v8_resource_cast<QQmlDelegateModelItem>(info.This()); V8ASSERT_TYPE(data, "Not a valid VisualData object"); @@ -588,7 +588,7 @@ public: return data->engine->fromVariant(static_cast<QQmlDMListAccessorData *>(data)->cachedData); } - static void set_modelData(v8::Local<v8::String>, v8::Local<v8::Value> value, const v8::AccessorInfo &info) + static void set_modelData(v8::Handle<v8::String>, v8::Handle<v8::Value> value, const v8::AccessorInfo &info) { QQmlDelegateModelItem *data = v8_resource_cast<QQmlDelegateModelItem>(info.This()); V8ASSERT_TYPE_SETTER(data, "Not a valid VisualData object"); @@ -599,7 +599,7 @@ public: v8::Handle<v8::Value> get() { - v8::Local<v8::Object> data = engineData(engine)->constructorListItem->NewInstance(); + v8::Handle<v8::Object> data = engineData(engine)->constructorListItem->NewInstance(); data->SetExternalResource(this); ++scriptRef; return data; @@ -954,7 +954,7 @@ QQmlAdaptorModelEngineData::QQmlAdaptorModelEngineData(QV8Engine *) strings->Set(ModelData, v8::String::New("modelData")); strings->Set(HasModelChildren, v8::String::New("hasModelChildren")); - v8::Local<v8::FunctionTemplate> listItem = v8::FunctionTemplate::New(); + v8::Handle<v8::FunctionTemplate> listItem = v8::FunctionTemplate::New(); listItem->InstanceTemplate()->SetHasExternalResource(true); listItem->InstanceTemplate()->SetAccessor(index(), get_index); listItem->InstanceTemplate()->SetAccessor( |