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/qqmlpropertycache.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/qqmlpropertycache.cpp')
-rw-r--r-- | src/qml/qml/qqmlpropertycache.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index 08005f1df2..65406c9391 100644 --- a/src/qml/qml/qqmlpropertycache.cpp +++ b/src/qml/qml/qqmlpropertycache.cpp @@ -1376,14 +1376,14 @@ inline const QString &qQmlPropertyCacheToString(const QString &string) return string; } -inline QString qQmlPropertyCacheToString(const QHashedV4String &string) +inline QString qQmlPropertyCacheToString(const QV4::String *string) { - return string.toString(); + return string->toQString(); } template<typename T> QQmlPropertyData * -qQmlPropertyCacheProperty(QQmlEngine *engine, QObject *obj, const T &name, +qQmlPropertyCacheProperty(QQmlEngine *engine, QObject *obj, T name, QQmlContextData *context, QQmlPropertyData &local) { QQmlPropertyCache *cache = 0; @@ -1417,17 +1417,17 @@ qQmlPropertyCacheProperty(QQmlEngine *engine, QObject *obj, const T &name, } QQmlPropertyData * -QQmlPropertyCache::property(QQmlEngine *engine, QObject *obj, const QHashedV4String &name, +QQmlPropertyCache::property(QQmlEngine *engine, QObject *obj, const QV4::String *name, QQmlContextData *context, QQmlPropertyData &local) { - return qQmlPropertyCacheProperty<QHashedV4String>(engine, obj, name, context, local); + return qQmlPropertyCacheProperty<const QV4::String *>(engine, obj, name, context, local); } QQmlPropertyData * QQmlPropertyCache::property(QQmlEngine *engine, QObject *obj, const QString &name, QQmlContextData *context, QQmlPropertyData &local) { - return qQmlPropertyCacheProperty<QString>(engine, obj, name, context, local); + return qQmlPropertyCacheProperty<const QString &>(engine, obj, name, context, local); } static inline const QMetaObjectPrivate *priv(const uint* data) |