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/qdeclarativecompiler.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/qdeclarativecompiler.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativecompiler.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index 8c26a3bfa6..69df595bb5 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -2235,7 +2235,7 @@ bool QDeclarativeCompiler::buildPropertyObjectAssignment(QDeclarativeScript::Pro QDeclarativeScript::Object *root = v->object; QDeclarativeScript::Object *component = pool->New<Object>(); component->type = componentTypeRef(); - component->typeName = "Qt/Component"; + component->typeName = QStringLiteral("Qt/Component"); component->metatype = &QDeclarativeComponent::staticMetaObject; component->location = root->location; QDeclarativeScript::Value *componentValue = pool->New<Value>(); @@ -2294,7 +2294,7 @@ bool QDeclarativeCompiler::buildPropertyOnAssignment(QDeclarativeScript::Propert buildDynamicMeta(baseObj, ForceCreation); v->type = isPropertyValue ? Value::ValueSource : Value::ValueInterceptor; } else { - COMPILE_EXCEPTION(v, tr("\"%1\" cannot operate on \"%2\"").arg(QString::fromUtf8(v->object->typeName)).arg(prop->name().toString())); + COMPILE_EXCEPTION(v, tr("\"%1\" cannot operate on \"%2\"").arg(v->object->typeName).arg(prop->name().toString())); } return true; @@ -2360,7 +2360,7 @@ bool QDeclarativeCompiler::testQualifiedEnumAssignment(const QMetaProperty &prop unit->imports().resolveType(typeName, &type, 0, 0, 0, 0); //handle enums on value types (where obj->typeName is empty) - QByteArray objTypeName = obj->typeName; + QString objTypeName = obj->typeName; if (objTypeName.isEmpty()) { QDeclarativeType *objType = toQmlType(obj); if (objType) @@ -2429,10 +2429,10 @@ int QDeclarativeCompiler::evaluateEnum(const QByteArray& script) const return -1; } -const QMetaObject *QDeclarativeCompiler::resolveType(const QByteArray& name) const +const QMetaObject *QDeclarativeCompiler::resolveType(const QString& name) const { QDeclarativeType *qmltype = 0; - if (!unit->imports().resolveType(QString::fromUtf8(name), &qmltype, 0, 0, 0, 0)) + if (!unit->imports().resolveType(name, &qmltype, 0, 0, 0, 0)) return 0; if (!qmltype) return 0; |