From d15e0aa9e71572325a19b24f3bd356cf8716ef2a Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Mon, 16 Jun 2014 11:38:27 +0200 Subject: [PATCH] RunFactories: Simplify pathFromId by using Core::Id::suffixAfter Change-Id: I2b65071be3e57c59588e6421d15c7739c257e1c5 Reviewed-by: Daniel Teske --- src/plugins/ios/iosrunfactories.cpp | 6 +----- .../remotelinux/remotelinuxrunconfigurationfactory.cpp | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/plugins/ios/iosrunfactories.cpp b/src/plugins/ios/iosrunfactories.cpp index aca51c9fcc5..259ebbe1b91 100644 --- a/src/plugins/ios/iosrunfactories.cpp +++ b/src/plugins/ios/iosrunfactories.cpp @@ -59,11 +59,7 @@ namespace Internal { static QString pathFromId(const Core::Id id) { - QString pathStr = id.toString(); - const QString prefix = QLatin1String(IOS_RC_ID_PREFIX); - if (!pathStr.startsWith(prefix)) - return QString(); - return pathStr.mid(prefix.size()); + return id.suffixAfter(IOS_RC_ID_PREFIX); } IosRunConfigurationFactory::IosRunConfigurationFactory(QObject *parent) diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp index 37438dcc2ba..93bda58d2f5 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp @@ -49,10 +49,7 @@ namespace Internal { namespace { QString pathFromId(Core::Id id) { - QByteArray idStr = id.name(); - if (!idStr.startsWith(RemoteLinuxRunConfiguration::IdPrefix)) - return QString(); - return QString::fromUtf8(idStr.mid(strlen(RemoteLinuxRunConfiguration::IdPrefix))); + return id.suffixAfter(RemoteLinuxRunConfiguration::IdPrefix); } } // namespace