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 --- tools/qmlplugindump/main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index 6132d15d0d..35e90cd3d4 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -204,8 +204,8 @@ QSet collectReachableMetaObjects(const QListtypeName() == "QDeclarativeComponent") continue; - QByteArray tyName = ty->qmlTypeName(); - tyName = tyName.mid(tyName.lastIndexOf('/') + 1); + QString tyName = ty->qmlTypeName(); + tyName = tyName.mid(tyName.lastIndexOf(QLatin1Char('/')) + 1); if (tyName.isEmpty()) continue; @@ -583,8 +583,8 @@ int main(int argc, char *argv[]) qWarning() << "Could not find QtObject type"; importCode = QByteArray("import QtQuick 2.0\n"); } else { - QByteArray module = qtObjectType->qmlTypeName(); - module = module.mid(0, module.lastIndexOf('/')); + QString module = qtObjectType->qmlTypeName(); + module = module.mid(0, module.lastIndexOf(QLatin1Char('/'))); importCode = QString("import %1 %2.%3\n").arg(module, QString::number(qtObjectType->majorVersion()), QString::number(qtObjectType->minorVersion())).toUtf8(); -- cgit v1.2.3