From 07cab1ab750d5505774572459725a7d3c0bb03dd Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 19 Mar 2013 12:30:54 +0100 Subject: RemoteLinux: Avoid some use of Core::Id QString use Change-Id: Id5e45466f85f61dfbe3e6d98646cc25dcc72d7e6 Reviewed-by: Christian Kandeler --- src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp') diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp index dedce8627b..d18c0065ae 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp @@ -49,10 +49,10 @@ namespace Internal { namespace { QString pathFromId(Core::Id id) { - QString idStr = QString::fromUtf8(id.name()); + QByteArray idStr = id.name(); if (!idStr.startsWith(RemoteLinuxRunConfiguration::IdPrefix)) return QString(); - return idStr.mid(RemoteLinuxRunConfiguration::IdPrefix.size()); + return QString::fromUtf8(idStr.mid(strlen(RemoteLinuxRunConfiguration::IdPrefix))); } } // namespace @@ -78,7 +78,7 @@ bool RemoteLinuxRunConfigurationFactory::canRestore(Target *parent, const QVaria { if (!canHandle(parent)) return false; - return idFromMap(map).toString().startsWith(RemoteLinuxRunConfiguration::IdPrefix); + return idFromMap(map).name().startsWith(RemoteLinuxRunConfiguration::IdPrefix); } bool RemoteLinuxRunConfigurationFactory::canClone(Target *parent, RunConfiguration *source) const @@ -94,8 +94,9 @@ QList RemoteLinuxRunConfigurationFactory::availableCreationIds(Target if (!canHandle(parent)) return result; + const Core::Id base = Core::Id(RemoteLinuxRunConfiguration::IdPrefix); foreach (const BuildTargetInfo &bti, parent->applicationTargets().list) - result << (Core::Id(RemoteLinuxRunConfiguration::IdPrefix + bti.projectFilePath.toString())); + result << base.withSuffix(bti.projectFilePath.toString()); return result; } -- cgit v1.2.1