diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2011-09-29 10:29:22 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-29 14:59:15 +0200 |
| commit | bcc9a4b3d10899f23b304fecb581aa0d50e1b4e5 (patch) | |
| tree | 557b4391429873a0a30e122059a9b1207a1ddb3d /src/declarative/qml/qdeclarativecustomparser_p.h | |
| parent | 15a52c1a5f9cf166305c264abc01e35bad918d84 (diff) | |
Remove more QByteArray<->QString conversions
Prefer to store types as QStrings. It's only when we manipulate
raw (compiled, meta-)data that utf conversion is needed.
Change-Id: Ie138a69c9a409804e1b90b21c1d60dedea35bddb
Reviewed-on: http://codereview.qt-project.org/5781
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativecustomparser_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativecustomparser_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/qml/qdeclarativecustomparser_p.h b/src/declarative/qml/qdeclarativecustomparser_p.h index 47b3ee8f8e..9aca8030c7 100644 --- a/src/declarative/qml/qdeclarativecustomparser_p.h +++ b/src/declarative/qml/qdeclarativecustomparser_p.h @@ -78,7 +78,7 @@ public: QDeclarativeCustomParserProperty &operator=(const QDeclarativeCustomParserProperty &); ~QDeclarativeCustomParserProperty(); - QByteArray name() const; + QString name() const; QDeclarativeScript::Location location() const; bool isList() const; @@ -101,7 +101,7 @@ public: QDeclarativeCustomParserNode &operator=(const QDeclarativeCustomParserNode &); ~QDeclarativeCustomParserNode(); - QByteArray name() const; + QString name() const; QDeclarativeScript::Location location() const; QList<QDeclarativeCustomParserProperty> properties() const; @@ -140,9 +140,9 @@ protected: int evaluateEnum(const QByteArray&) const; - const QMetaObject *resolveType(const QByteArray&) const; + const QMetaObject *resolveType(const QString&) const; - QDeclarativeBinding::Identifier rewriteBinding(const QString&, const QByteArray&); + QDeclarativeBinding::Identifier rewriteBinding(const QString&, const QString&); private: QList<QDeclarativeError> exceptions; |