feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Move Project::makeUnique to Utils

Browse Source 
This is more generic than projects

Change-Id: Ifdbc57ff48f9fd4a40e6149ba636e0a55cbac502
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Eike Ziller
2018-03-28 16:03:11 +02:00
parent 7160b83589
commit ab7960f6cf
8 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/projectexplorer/target.cpp
View File

@@ -44,8 +44,9 @@
#include <projectexplorer/projectexplorericons.h>
#include <extensionsystem/pluginmanager.h>
#include <projectexplorer/projectexplorer.h>
#include <utils/qtcassert.h>
#include <utils/algorithm.h>
#include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <QDebug>
#include <QIcon>
@@ -190,7 +191,7 @@ void Target::addBuildConfiguration(BuildConfiguration *bc)
// Check that we don't have a configuration with the same displayName
QString configurationDisplayName = bc->displayName();
QStringList displayNames = Utils::transform(d->m_buildConfigurations, &BuildConfiguration::displayName);
configurationDisplayName = Project::makeUnique(configurationDisplayName, displayNames);
configurationDisplayName = Utils::makeUniquelyNumbered(configurationDisplayName, displayNames);
if (configurationDisplayName != bc->displayName()) {
if (bc->usesDefaultDisplayName())
bc->setDefaultDisplayName(configurationDisplayName);
@@ -265,7 +266,7 @@ void Target::addDeployConfiguration(DeployConfiguration *dc)
// Check that we don't have a configuration with the same displayName
QString configurationDisplayName = dc->displayName();
QStringList displayNames = Utils::transform(d->m_deployConfigurations, &DeployConfiguration::displayName);
configurationDisplayName = Project::makeUnique(configurationDisplayName, displayNames);
configurationDisplayName = Utils::makeUniquelyNumbered(configurationDisplayName, displayNames);
dc->setDisplayName(configurationDisplayName);
// add it
@@ -376,7 +377,7 @@ void Target::addRunConfiguration(RunConfiguration *rc)
// Check that we don't have a configuration with the same displayName
QString configurationDisplayName = rc->displayName();
QStringList displayNames = Utils::transform(d->m_runConfigurations, &RunConfiguration::displayName);
configurationDisplayName = Project::makeUnique(configurationDisplayName, displayNames);
configurationDisplayName = Utils::makeUniquelyNumbered(configurationDisplayName, displayNames);
rc->setDisplayName(configurationDisplayName);
d->m_runConfigurations.push_back(rc);