From bcc9a4b3d10899f23b304fecb581aa0d50e1b4e5 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Thu, 29 Sep 2011 10:29:22 +0200 Subject: 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 Reviewed-by: Roberto Raggi --- src/declarative/qml/qdeclarativeinfo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/declarative/qml/qdeclarativeinfo.cpp') diff --git a/src/declarative/qml/qdeclarativeinfo.cpp b/src/declarative/qml/qdeclarativeinfo.cpp index 995a6b9ad7..d221eaeefb 100644 --- a/src/declarative/qml/qdeclarativeinfo.cpp +++ b/src/declarative/qml/qdeclarativeinfo.cpp @@ -120,7 +120,7 @@ QDeclarativeInfo::~QDeclarativeInfo() QString typeName; QDeclarativeType *type = QDeclarativeMetaType::qmlType(object->metaObject()); if (type) { - typeName = QLatin1String(type->qmlTypeName()); + typeName = type->qmlTypeName(); int lastSlash = typeName.lastIndexOf(QLatin1Char('/')); if (lastSlash != -1) typeName = typeName.mid(lastSlash+1); @@ -136,7 +136,7 @@ QDeclarativeInfo::~QDeclarativeInfo() typeName += QLatin1Char('*'); type = QDeclarativeMetaType::qmlType(QMetaType::type(typeName.toLatin1())); if (type) { - typeName = QLatin1String(type->qmlTypeName()); + typeName = type->qmlTypeName(); int lastSlash = typeName.lastIndexOf(QLatin1Char('/')); if (lastSlash != -1) typeName = typeName.mid(lastSlash+1); -- cgit v1.2.3