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/qqmlmetatype.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/qqmlmetatype.cpp')
| -rw-r--r-- | src/qml/qml/qqmlmetatype.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp index 9a9e6df366..188fa7db0d 100644 --- a/src/qml/qml/qqmlmetatype.cpp +++ b/src/qml/qml/qqmlmetatype.cpp @@ -902,7 +902,7 @@ int QQmlType::enumValue(const QHashedCStringRef &name, bool *ok) const return -1; } -int QQmlType::enumValue(const QHashedV4String &name, bool *ok) const +int QQmlType::enumValue(const QV4::String *name, bool *ok) const { Q_ASSERT(ok); *ok = true; @@ -976,7 +976,7 @@ QQmlType *QQmlTypeModule::type(const QHashedStringRef &name, int minor) return 0; } -QQmlType *QQmlTypeModule::type(const QHashedV4String &name, int minor) +QQmlType *QQmlTypeModule::type(const QV4::String *name, int minor) { QReadLocker lock(metaTypeDataLock()); @@ -1045,7 +1045,7 @@ QQmlType *QQmlTypeModuleVersion::type(const QHashedStringRef &name) const else return 0; } -QQmlType *QQmlTypeModuleVersion::type(const QHashedV4String &name) const +QQmlType *QQmlTypeModuleVersion::type(const QV4::String *name) const { if (m_module) return m_module->type(name, m_minor); else return 0; |