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

Use Core::Id in project-related objects

Browse Source 
Use Core::Id for all the project related objects in favor of plain
QStrings.

Change-Id: I790ab40cb29899efdb49c413a77609486f52e683
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Tobias Hunger
2012-03-15 17:17:40 +01:00
parent cf26765c62
commit df5dab6382
217 changed files with 1379 additions and 1357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,8 +112,9 @@ QList<DeployConfigurationFactory *> TargetPrivate::deployFactories() const
}
Target::Target(Project *project, const QString &id) :
ProjectConfiguration(project, id), d(new TargetPrivate)
Target::Target(Project *project, const Core::Id id) :
ProjectConfiguration(project, id),
d(new TargetPrivate)
{
connect(DeviceManager::instance(), SIGNAL(deviceUpdated(Core::Id)),
this, SLOT(updateDeviceState(Core::Id)));
@@ -328,15 +329,15 @@ void Target::setActiveDeployConfiguration(DeployConfiguration *dc)
updateDeviceState();
}
QStringList Target::availableDeployConfigurationIds()
QList<Core::Id> Target::availableDeployConfigurationIds()
{
QStringList ids;
QList<Core::Id> ids;
foreach (const DeployConfigurationFactory * const factory, d->deployFactories())
ids << factory->availableCreationIds(this);
return ids;
}
QString Target::displayNameForDeployConfigurationId(const QString &id)
QString Target::displayNameForDeployConfigurationId(Core::Id &id)
{
foreach (const DeployConfigurationFactory * const factory, d->deployFactories()) {
if (factory->availableCreationIds(this).contains(id))
@@ -345,7 +346,7 @@ QString Target::displayNameForDeployConfigurationId(const QString &id)
return QString();
}
DeployConfiguration *Target::createDeployConfiguration(const QString &id)
DeployConfiguration *Target::createDeployConfiguration(Core::Id id)
{
foreach (DeployConfigurationFactory * const factory, d->deployFactories()) {
if (factory->canCreate(this, id))
@@ -459,7 +460,7 @@ QList<ToolChain *> Target::possibleToolChains(BuildConfiguration *) const
QList<ToolChain *> tcList = ToolChainManager::instance()->toolChains();
QList<ToolChain *> result;
foreach (ToolChain *tc, tcList) {
QStringList restricted = tc->restrictedToTargets();
QList<Core::Id> restricted = tc->restrictedToTargets();
if (restricted.isEmpty() || restricted.contains(id()))
result.append(tc);
}