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/qdeclarativemetatype.cpp | |
| 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/qdeclarativemetatype.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativemetatype.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp index 4289dee907..ebe9808db3 100644 --- a/src/declarative/qml/qdeclarativemetatype.cpp +++ b/src/declarative/qml/qdeclarativemetatype.cpp @@ -180,7 +180,7 @@ public: bool m_isInterface : 1; const char *m_iid; QString m_module; - QByteArray m_name; + QString m_name; QString m_elementName; int m_version_maj; int m_version_min; @@ -242,9 +242,9 @@ QDeclarativeType::QDeclarativeType(int index, const QDeclarativePrivate::Registe QDeclarativeType::QDeclarativeType(int index, const QDeclarativePrivate::RegisterType &type) : d(new QDeclarativeTypePrivate) { - QByteArray name = type.uri; - if (type.uri) name += '/'; - name += type.elementName; + QString name = QString::fromUtf8(type.uri); + if (type.uri) name += QLatin1Char('/'); + name += QString::fromUtf8(type.elementName); d->m_module = QString::fromUtf8(type.uri); d->m_name = name; @@ -517,14 +517,14 @@ QByteArray QDeclarativeType::typeName() const const QString &QDeclarativeType::elementName() const { if (d->m_elementName.isEmpty()) { - QByteArray n = qmlTypeName(); - int idx = n.lastIndexOf('/'); - d->m_elementName = QString::fromUtf8(n.mid(idx + 1)); + QString n = qmlTypeName(); + int idx = n.lastIndexOf(QLatin1Char('/')); + d->m_elementName = n.mid(idx + 1); } return d->m_elementName; } -const QByteArray &QDeclarativeType::qmlTypeName() const +const QString &QDeclarativeType::qmlTypeName() const { return d->m_name; } @@ -861,7 +861,7 @@ int registerInterface(const QDeclarativePrivate::RegisterInterface &interface) data->idToType.insert(type->qListTypeId(), type); // XXX No insertMulti, so no multi-version interfaces? if (!type->qmlTypeName().isEmpty()) - data->nameToType.insert(QString::fromUtf8(type->qmlTypeName()), type); + data->nameToType.insert(type->qmlTypeName(), type); if (data->interfaces.size() <= interface.typeId) data->interfaces.resize(interface.typeId + 16); @@ -895,7 +895,7 @@ int registerType(const QDeclarativePrivate::RegisterType &type) if (dtype->qListTypeId()) data->idToType.insert(dtype->qListTypeId(), dtype); if (!dtype->qmlTypeName().isEmpty()) - data->nameToType.insertMulti(QString::fromUtf8(dtype->qmlTypeName()), dtype); + data->nameToType.insertMulti(dtype->qmlTypeName(), dtype); data->metaObjectToType.insertMulti(dtype->baseMetaObject(), dtype); |