forked from qt-creator/qt-creator
ProjectExplorer: Replace a few foreach()
Change-Id: I445cdfaac13ac894be3cd6fc8c20b4a09f460a01 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
@@ -244,7 +244,7 @@ QString BuildSettingsWidget::uniqueName(const QString & name)
|
|||||||
QString result = name.trimmed();
|
QString result = name.trimmed();
|
||||||
if (!result.isEmpty()) {
|
if (!result.isEmpty()) {
|
||||||
QStringList bcNames;
|
QStringList bcNames;
|
||||||
foreach (BuildConfiguration *bc, m_target->buildConfigurations()) {
|
for (BuildConfiguration *bc : m_target->buildConfigurations()) {
|
||||||
if (bc == m_buildConfiguration)
|
if (bc == m_buildConfiguration)
|
||||||
continue;
|
continue;
|
||||||
bcNames.append(bc->displayName());
|
bcNames.append(bc->displayName());
|
||||||
|
@@ -1160,11 +1160,11 @@ void MiniProjectTargetSelector::addedTarget(Target *target)
|
|||||||
|
|
||||||
m_listWidgets[TARGET]->addProjectConfiguration(target);
|
m_listWidgets[TARGET]->addProjectConfiguration(target);
|
||||||
|
|
||||||
foreach (BuildConfiguration *bc, target->buildConfigurations())
|
for (BuildConfiguration *bc : target->buildConfigurations())
|
||||||
addedBuildConfiguration(bc);
|
addedBuildConfiguration(bc);
|
||||||
foreach (DeployConfiguration *dc, target->deployConfigurations())
|
for (DeployConfiguration *dc : target->deployConfigurations())
|
||||||
addedDeployConfiguration(dc);
|
addedDeployConfiguration(dc);
|
||||||
foreach (RunConfiguration *rc, target->runConfigurations())
|
for (RunConfiguration *rc : target->runConfigurations())
|
||||||
addedRunConfiguration(rc);
|
addedRunConfiguration(rc);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1175,11 +1175,11 @@ void MiniProjectTargetSelector::removedTarget(Target *target)
|
|||||||
|
|
||||||
m_listWidgets[TARGET]->removeProjectConfiguration(target);
|
m_listWidgets[TARGET]->removeProjectConfiguration(target);
|
||||||
|
|
||||||
foreach (BuildConfiguration *bc, target->buildConfigurations())
|
for (BuildConfiguration *bc : target->buildConfigurations())
|
||||||
removedBuildConfiguration(bc);
|
removedBuildConfiguration(bc);
|
||||||
foreach (DeployConfiguration *dc, target->deployConfigurations())
|
for (DeployConfiguration *dc : target->deployConfigurations())
|
||||||
removedDeployConfiguration(dc);
|
removedDeployConfiguration(dc);
|
||||||
foreach (RunConfiguration *rc, target->runConfigurations())
|
for (RunConfiguration *rc : target->runConfigurations())
|
||||||
removedRunConfiguration(rc);
|
removedRunConfiguration(rc);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1364,17 +1364,17 @@ void MiniProjectTargetSelector::activeTargetChanged(Target *target)
|
|||||||
|
|
||||||
if (m_target) {
|
if (m_target) {
|
||||||
QList<QObject *> bl;
|
QList<QObject *> bl;
|
||||||
foreach (BuildConfiguration *bc, target->buildConfigurations())
|
for (BuildConfiguration *bc : target->buildConfigurations())
|
||||||
bl.append(bc);
|
bl.append(bc);
|
||||||
m_listWidgets[BUILD]->setProjectConfigurations(bl, target->activeBuildConfiguration());
|
m_listWidgets[BUILD]->setProjectConfigurations(bl, target->activeBuildConfiguration());
|
||||||
|
|
||||||
QList<QObject *> dl;
|
QList<QObject *> dl;
|
||||||
foreach (DeployConfiguration *dc, target->deployConfigurations())
|
for (DeployConfiguration *dc : target->deployConfigurations())
|
||||||
dl.append(dc);
|
dl.append(dc);
|
||||||
m_listWidgets[DEPLOY]->setProjectConfigurations(dl, target->activeDeployConfiguration());
|
m_listWidgets[DEPLOY]->setProjectConfigurations(dl, target->activeDeployConfiguration());
|
||||||
|
|
||||||
QList<QObject *> rl;
|
QList<QObject *> rl;
|
||||||
foreach (RunConfiguration *rc, target->runConfigurations())
|
for (RunConfiguration *rc : target->runConfigurations())
|
||||||
rl.append(rc);
|
rl.append(rc);
|
||||||
m_listWidgets[RUN]->setProjectConfigurations(rl, target->activeRunConfiguration());
|
m_listWidgets[RUN]->setProjectConfigurations(rl, target->activeRunConfiguration());
|
||||||
|
|
||||||
|
@@ -401,7 +401,7 @@ bool Project::copySteps(Target *sourceTarget, Target *newTarget)
|
|||||||
QStringList runconfigurationError;
|
QStringList runconfigurationError;
|
||||||
|
|
||||||
const Project * const project = newTarget->project();
|
const Project * const project = newTarget->project();
|
||||||
foreach (BuildConfiguration *sourceBc, sourceTarget->buildConfigurations()) {
|
for (BuildConfiguration *sourceBc : sourceTarget->buildConfigurations()) {
|
||||||
ProjectMacroExpander expander(project->projectFilePath(), project->displayName(),
|
ProjectMacroExpander expander(project->projectFilePath(), project->displayName(),
|
||||||
newTarget->kit(), sourceBc->displayName(),
|
newTarget->kit(), sourceBc->displayName(),
|
||||||
sourceBc->buildType());
|
sourceBc->buildType());
|
||||||
@@ -423,7 +423,7 @@ bool Project::copySteps(Target *sourceTarget, Target *newTarget)
|
|||||||
SessionManager::setActiveBuildConfiguration(newTarget, bcs.first(), SetActive::NoCascade);
|
SessionManager::setActiveBuildConfiguration(newTarget, bcs.first(), SetActive::NoCascade);
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (DeployConfiguration *sourceDc, sourceTarget->deployConfigurations()) {
|
for (DeployConfiguration *sourceDc : sourceTarget->deployConfigurations()) {
|
||||||
DeployConfiguration *newDc = DeployConfigurationFactory::clone(newTarget, sourceDc);
|
DeployConfiguration *newDc = DeployConfigurationFactory::clone(newTarget, sourceDc);
|
||||||
if (!newDc) {
|
if (!newDc) {
|
||||||
deployconfigurationError << sourceDc->displayName();
|
deployconfigurationError << sourceDc->displayName();
|
||||||
@@ -440,7 +440,7 @@ bool Project::copySteps(Target *sourceTarget, Target *newTarget)
|
|||||||
SessionManager::setActiveDeployConfiguration(newTarget, dcs.first(), SetActive::NoCascade);
|
SessionManager::setActiveDeployConfiguration(newTarget, dcs.first(), SetActive::NoCascade);
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (RunConfiguration *sourceRc, sourceTarget->runConfigurations()) {
|
for (RunConfiguration *sourceRc : sourceTarget->runConfigurations()) {
|
||||||
RunConfiguration *newRc = RunConfigurationFactory::clone(newTarget, sourceRc);
|
RunConfiguration *newRc = RunConfigurationFactory::clone(newTarget, sourceRc);
|
||||||
if (!newRc) {
|
if (!newRc) {
|
||||||
runconfigurationError << sourceRc->displayName();
|
runconfigurationError << sourceRc->displayName();
|
||||||
|
@@ -323,7 +323,7 @@ void SessionManager::setActiveBuildConfiguration(Target *target, BuildConfigurat
|
|||||||
if (!otherTarget || otherTarget->kit()->id() != kitId)
|
if (!otherTarget || otherTarget->kit()->id() != kitId)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
foreach (BuildConfiguration *otherBc, otherTarget->buildConfigurations()) {
|
for (BuildConfiguration *otherBc : otherTarget->buildConfigurations()) {
|
||||||
if (otherBc->displayName() == name) {
|
if (otherBc->displayName() == name) {
|
||||||
otherTarget->setActiveBuildConfiguration(otherBc);
|
otherTarget->setActiveBuildConfiguration(otherBc);
|
||||||
break;
|
break;
|
||||||
@@ -351,7 +351,7 @@ void SessionManager::setActiveDeployConfiguration(Target *target, DeployConfigur
|
|||||||
if (!otherTarget || otherTarget->kit()->id() != kitId)
|
if (!otherTarget || otherTarget->kit()->id() != kitId)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
foreach (DeployConfiguration *otherDc, otherTarget->deployConfigurations()) {
|
for (DeployConfiguration *otherDc : otherTarget->deployConfigurations()) {
|
||||||
if (otherDc->displayName() == name) {
|
if (otherDc->displayName() == name) {
|
||||||
otherTarget->setActiveDeployConfiguration(otherDc);
|
otherTarget->setActiveDeployConfiguration(otherDc);
|
||||||
break;
|
break;
|
||||||
|
@@ -314,7 +314,7 @@ bool Target::removeBuildConfiguration(BuildConfiguration *bc)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
QList<BuildConfiguration *> Target::buildConfigurations() const
|
const QList<BuildConfiguration *> Target::buildConfigurations() const
|
||||||
{
|
{
|
||||||
return d->m_buildConfigurations;
|
return d->m_buildConfigurations;
|
||||||
}
|
}
|
||||||
@@ -385,7 +385,7 @@ bool Target::removeDeployConfiguration(DeployConfiguration *dc)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
QList<DeployConfiguration *> Target::deployConfigurations() const
|
const QList<DeployConfiguration *> Target::deployConfigurations() const
|
||||||
{
|
{
|
||||||
return d->m_deployConfigurations;
|
return d->m_deployConfigurations;
|
||||||
}
|
}
|
||||||
@@ -406,7 +406,7 @@ void Target::setActiveDeployConfiguration(DeployConfiguration *dc)
|
|||||||
updateDeviceState();
|
updateDeviceState();
|
||||||
}
|
}
|
||||||
|
|
||||||
QList<RunConfiguration *> Target::runConfigurations() const
|
const QList<RunConfiguration *> Target::runConfigurations() const
|
||||||
{
|
{
|
||||||
return d->m_runConfigurations;
|
return d->m_runConfigurations;
|
||||||
}
|
}
|
||||||
|
@@ -71,18 +71,18 @@ public:
|
|||||||
void addBuildConfiguration(BuildConfiguration *bc);
|
void addBuildConfiguration(BuildConfiguration *bc);
|
||||||
bool removeBuildConfiguration(BuildConfiguration *bc);
|
bool removeBuildConfiguration(BuildConfiguration *bc);
|
||||||
|
|
||||||
QList<BuildConfiguration *> buildConfigurations() const;
|
const QList<BuildConfiguration *> buildConfigurations() const;
|
||||||
BuildConfiguration *activeBuildConfiguration() const;
|
BuildConfiguration *activeBuildConfiguration() const;
|
||||||
|
|
||||||
// DeployConfiguration
|
// DeployConfiguration
|
||||||
void addDeployConfiguration(DeployConfiguration *dc);
|
void addDeployConfiguration(DeployConfiguration *dc);
|
||||||
bool removeDeployConfiguration(DeployConfiguration *dc);
|
bool removeDeployConfiguration(DeployConfiguration *dc);
|
||||||
|
|
||||||
QList<DeployConfiguration *> deployConfigurations() const;
|
const QList<DeployConfiguration *> deployConfigurations() const;
|
||||||
DeployConfiguration *activeDeployConfiguration() const;
|
DeployConfiguration *activeDeployConfiguration() const;
|
||||||
|
|
||||||
// Running
|
// Running
|
||||||
QList<RunConfiguration *> runConfigurations() const;
|
const QList<RunConfiguration *> runConfigurations() const;
|
||||||
void addRunConfiguration(RunConfiguration *rc);
|
void addRunConfiguration(RunConfiguration *rc);
|
||||||
void removeRunConfiguration(RunConfiguration *rc);
|
void removeRunConfiguration(RunConfiguration *rc);
|
||||||
|
|
||||||
|
@@ -350,7 +350,7 @@ bool MemcheckErrorFilterProxyModel::filterAcceptsRow(int sourceRow, const QModel
|
|||||||
if (file.isExecutable())
|
if (file.isExecutable())
|
||||||
validFolders << file.remoteDirectory();
|
validFolders << file.remoteDirectory();
|
||||||
}
|
}
|
||||||
foreach (BuildConfiguration *config, target->buildConfigurations())
|
for (BuildConfiguration *config : target->buildConfigurations())
|
||||||
validFolders << config->buildDirectory().toString();
|
validFolders << config->buildDirectory().toString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user