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_p.h | |
| 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_p.h')
| -rw-r--r-- | src/qml/qml/qqmlmetatype_p.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h index 26fba2b2fc..e44eade902 100644 --- a/src/qml/qml/qqmlmetatype_p.h +++ b/src/qml/qml/qqmlmetatype_p.h @@ -61,6 +61,8 @@ #include <QtCore/qbitarray.h> #include <QtQml/qjsvalue.h> +#include <private/qv4string_p.h> + QT_BEGIN_NAMESPACE class QQmlType; @@ -136,7 +138,6 @@ private: struct QQmlMetaTypeData; class QHashedCStringRef; -class QHashedV4String; class Q_QML_PRIVATE_EXPORT QQmlType { public: @@ -213,7 +214,7 @@ public: int enumValue(const QHashedStringRef &, bool *ok) const; int enumValue(const QHashedCStringRef &, bool *ok) const; - int enumValue(const QHashedV4String &, bool *ok) const; + int enumValue(const QV4::String *, bool *ok) const; private: QQmlType *superType() const; friend class QQmlTypePrivate; @@ -252,7 +253,7 @@ public: int maximumMinorVersion() const; QQmlType *type(const QHashedStringRef &, int); - QQmlType *type(const QHashedV4String &, int); + QQmlType *type(const QV4::String *, int); QList<QQmlType*> singletonTypes(int) const; @@ -279,7 +280,7 @@ public: int minorVersion() const; QQmlType *type(const QHashedStringRef &) const; - QQmlType *type(const QHashedV4String &) const; + QQmlType *type(const QV4::String *) const; private: QQmlTypeModule *m_module; |