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>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index 0d390b093a..2f1ad82138 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -91,16 +91,16 @@ static inline QString buildTypeNameForDebug(const QMetaObject *metaObject)
     static const QChar underscore(QLatin1Char('_'));
     static const QChar asterisk(QLatin1Char('*'));
     QDeclarativeType *type = QDeclarativeMetaType::qmlType(metaObject);
-    QString typeName = type ? QLatin1String(type->qmlTypeName()) : QLatin1String(metaObject->className());
+    QString typeName = type ? type->qmlTypeName() : QString::fromUtf8(metaObject->className());
     if (!type) {
         //### optimize further?
         int marker = typeName.indexOf(qmlMarker);
         if (marker != -1 && marker < typeName.count() - 1) {
             if (typeName[marker + 1] == underscore) {
                 const QString className = typeName.left(marker) + asterisk;
-                type = QDeclarativeMetaType::qmlType(QMetaType::type(className.toLatin1()));
+                type = QDeclarativeMetaType::qmlType(QMetaType::type(className.toUtf8()));
                 if (type)
-                    typeName = QLatin1String(type->qmlTypeName());
+                    typeName = type->qmlTypeName();
             }
         }
     }