diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-06-26 09:43:45 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-28 14:56:04 +0200 |
| commit | f7d727f62c1f1bc0ab756a62ce51b042abf76eb5 (patch) | |
| tree | 9dd5dc892fb155827e9a4aee5007884ee29e490c /src/qml/qml/qqmltypewrapper.cpp | |
| parent | 553b41c407985e5b18f089679c014d884624afbd (diff) | |
Get rid of QHashedV4String
This was required while we were using V8, but now
we can simply pass QV4::String pointers.
Change-Id: If6338e4a455d6132fe14e5e603e4fe9e477d1ffb
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmltypewrapper.cpp')
| -rw-r--r-- | src/qml/qml/qqmltypewrapper.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/qml/qml/qqmltypewrapper.cpp b/src/qml/qml/qqmltypewrapper.cpp index 241d1f42a3..f4e9d9b406 100644 --- a/src/qml/qml/qqmltypewrapper.cpp +++ b/src/qml/qml/qqmltypewrapper.cpp @@ -129,8 +129,6 @@ Value QmlTypeWrapper::get(Managed *m, String *name, bool *hasProperty) QObject *object = w->object; - QHashedV4String propertystring(Value::fromString(name)); - if (w->type) { QQmlType *type = w->type; @@ -174,7 +172,7 @@ Value QmlTypeWrapper::get(Managed *m, String *name, bool *hasProperty) if (name->startsWithUpper()) { bool ok = false; - int value = type->enumValue(propertystring, &ok); + int value = type->enumValue(name, &ok); if (ok) return QV4::Value::fromInt32(value); @@ -195,7 +193,7 @@ Value QmlTypeWrapper::get(Managed *m, String *name, bool *hasProperty) } else if (w->typeNamespace) { Q_ASSERT(w->importNamespace); - QQmlTypeNameCache::Result r = w->typeNamespace->query(propertystring, + QQmlTypeNameCache::Result r = w->typeNamespace->query(name, w->importNamespace); if (r.isValid()) { @@ -236,8 +234,6 @@ void QmlTypeWrapper::put(Managed *m, String *name, const Value &value) QV8Engine *v8engine = v4->v8Engine; QQmlContextData *context = v8engine->callingContext(); - QHashedV4String propertystring(Value::fromString(name)); - QQmlType *type = w->type; if (type && !type->isSingleton() && w->object) { QObject *object = w->object; |