diff options
| author | hjk <hjk121@nokiamail.com> | 2013-03-21 16:22:27 +0100 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2013-03-22 12:28:24 +0100 |
| commit | e12e797d59bab0043ae2f183ffd8bf9562ec9dec (patch) | |
| tree | ce4ddae8075e1cfb4eee1fb04b47ffe5b7ff32b6 /src | |
| parent | 7dd7f0a035f1e2c675f7b8a01b5c0635c6e0a3d9 (diff) | |
| download | qt-creator-e12e797d59bab0043ae2f183ffd8bf9562ec9dec.tar.gz | |
Cmake: use new Core::Id interfaces
Change-Id: I3fee4afb72231833abf177d334c881c7b646fb9e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp index 0cf6a85f75..2e804f5355 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp @@ -528,7 +528,7 @@ bool CMakeRunConfigurationFactory::canClone(ProjectExplorer::Target *parent, Pro { if (!canHandle(parent)) return false; - return source->id().toString().startsWith(QLatin1String(CMAKE_RC_PREFIX)); + return source->id().name().startsWith(CMAKE_RC_PREFIX); } ProjectExplorer::RunConfiguration *CMakeRunConfigurationFactory::clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration * source) @@ -543,8 +543,7 @@ bool CMakeRunConfigurationFactory::canRestore(ProjectExplorer::Target *parent, c { if (!qobject_cast<CMakeProject *>(parent->project())) return false; - QString id = QString::fromUtf8(ProjectExplorer::idFromMap(map).name()); - return id.startsWith(QLatin1String(CMAKE_RC_PREFIX)); + return ProjectExplorer::idFromMap(map).name().startsWith(CMAKE_RC_PREFIX); } ProjectExplorer::RunConfiguration *CMakeRunConfigurationFactory::restore(ProjectExplorer::Target *parent, const QVariantMap &map) @@ -561,14 +560,10 @@ ProjectExplorer::RunConfiguration *CMakeRunConfigurationFactory::restore(Project QString CMakeRunConfigurationFactory::buildTargetFromId(Core::Id id) { - QString idstr = QString::fromUtf8(id.name()); - if (!idstr.startsWith(QLatin1String(CMAKE_RC_PREFIX))) - return QString(); - return idstr.mid(QString::fromLatin1(CMAKE_RC_PREFIX).length()); + return id.suffixAfter(CMAKE_RC_PREFIX); } Core::Id CMakeRunConfigurationFactory::idFromBuildTarget(const QString &target) { - QString id = QString::fromLatin1(CMAKE_RC_PREFIX) + target; - return Core::Id(id.toUtf8()); + return Core::Id(CMAKE_RC_PREFIX).withSuffix(target); } |