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

ProjectExplorer: Replace a few foreach()

Browse Source 
Change-Id: I445cdfaac13ac894be3cd6fc8c20b4a09f460a01
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-02-28 16:58:37 +01:00
parent 6d169ae7aa
commit 6164378372
7 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/buildsettingspropertiespage.cpp
View File

@@ -244,7 +244,7 @@ QString BuildSettingsWidget::uniqueName(const QString & name)
QString result = name.trimmed();
if (!result.isEmpty()) {
QStringList bcNames;
foreach (BuildConfiguration *bc, m_target->buildConfigurations()) {
for (BuildConfiguration *bc : m_target->buildConfigurations()) {
if (bc == m_buildConfiguration)
continue;
bcNames.append(bc->displayName());

18
src/plugins/projectexplorer/miniprojecttargetselector.cpp
View File

@@ -1160,11 +1160,11 @@ void MiniProjectTargetSelector::addedTarget(Target *target)
m_listWidgets[TARGET]->addProjectConfiguration(target);
foreach (BuildConfiguration *bc, target->buildConfigurations())
for (BuildConfiguration *bc : target->buildConfigurations())
addedBuildConfiguration(bc);
foreach (DeployConfiguration *dc, target->deployConfigurations())
for (DeployConfiguration *dc : target->deployConfigurations())
addedDeployConfiguration(dc);
foreach (RunConfiguration *rc, target->runConfigurations())
for (RunConfiguration *rc : target->runConfigurations())
addedRunConfiguration(rc);
}
@@ -1175,11 +1175,11 @@ void MiniProjectTargetSelector::removedTarget(Target *target)
m_listWidgets[TARGET]->removeProjectConfiguration(target);
foreach (BuildConfiguration *bc, target->buildConfigurations())
for (BuildConfiguration *bc : target->buildConfigurations())
removedBuildConfiguration(bc);
foreach (DeployConfiguration *dc, target->deployConfigurations())
for (DeployConfiguration *dc : target->deployConfigurations())
removedDeployConfiguration(dc);
foreach (RunConfiguration *rc, target->runConfigurations())
for (RunConfiguration *rc : target->runConfigurations())
removedRunConfiguration(rc);
}
@@ -1364,17 +1364,17 @@ void MiniProjectTargetSelector::activeTargetChanged(Target *target)
if (m_target) {
QList<QObject *> bl;
foreach (BuildConfiguration *bc, target->buildConfigurations())
for (BuildConfiguration *bc : target->buildConfigurations())
bl.append(bc);
m_listWidgets[BUILD]->setProjectConfigurations(bl, target->activeBuildConfiguration());
QList<QObject *> dl;
foreach (DeployConfiguration *dc, target->deployConfigurations())
for (DeployConfiguration *dc : target->deployConfigurations())
dl.append(dc);
m_listWidgets[DEPLOY]->setProjectConfigurations(dl, target->activeDeployConfiguration());
QList<QObject *> rl;
foreach (RunConfiguration *rc, target->runConfigurations())
for (RunConfiguration *rc : target->runConfigurations())
rl.append(rc);
m_listWidgets[RUN]->setProjectConfigurations(rl, target->activeRunConfiguration());

6
src/plugins/projectexplorer/project.cpp
View File

@@ -401,7 +401,7 @@ bool Project::copySteps(Target *sourceTarget, Target *newTarget)
QStringList runconfigurationError;
const Project * const project = newTarget->project();
foreach (BuildConfiguration *sourceBc, sourceTarget->buildConfigurations()) {
for (BuildConfiguration *sourceBc : sourceTarget->buildConfigurations()) {
ProjectMacroExpander expander(project->projectFilePath(), project->displayName(),
newTarget->kit(), sourceBc->displayName(),
sourceBc->buildType());
@@ -423,7 +423,7 @@ bool Project::copySteps(Target *sourceTarget, Target *newTarget)
SessionManager::setActiveBuildConfiguration(newTarget, bcs.first(), SetActive::NoCascade);
}
foreach (DeployConfiguration *sourceDc, sourceTarget->deployConfigurations()) {
for (DeployConfiguration *sourceDc : sourceTarget->deployConfigurations()) {
DeployConfiguration *newDc = DeployConfigurationFactory::clone(newTarget, sourceDc);
if (!newDc) {
deployconfigurationError << sourceDc->displayName();
@@ -440,7 +440,7 @@ bool Project::copySteps(Target *sourceTarget, Target *newTarget)
SessionManager::setActiveDeployConfiguration(newTarget, dcs.first(), SetActive::NoCascade);
}
foreach (RunConfiguration *sourceRc, sourceTarget->runConfigurations()) {
for (RunConfiguration *sourceRc : sourceTarget->runConfigurations()) {
RunConfiguration *newRc = RunConfigurationFactory::clone(newTarget, sourceRc);
if (!newRc) {
runconfigurationError << sourceRc->displayName();

4
src/plugins/projectexplorer/session.cpp
View File

@@ -323,7 +323,7 @@ void SessionManager::setActiveBuildConfiguration(Target *target, BuildConfigurat
if (!otherTarget || otherTarget->kit()->id() != kitId)
continue;
foreach (BuildConfiguration *otherBc, otherTarget->buildConfigurations()) {
for (BuildConfiguration *otherBc : otherTarget->buildConfigurations()) {
if (otherBc->displayName() == name) {
otherTarget->setActiveBuildConfiguration(otherBc);
break;
@@ -351,7 +351,7 @@ void SessionManager::setActiveDeployConfiguration(Target *target, DeployConfigur
if (!otherTarget || otherTarget->kit()->id() != kitId)
continue;
foreach (DeployConfiguration *otherDc, otherTarget->deployConfigurations()) {
for (DeployConfiguration *otherDc : otherTarget->deployConfigurations()) {
if (otherDc->displayName() == name) {
otherTarget->setActiveDeployConfiguration(otherDc);
break;

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

@@ -314,7 +314,7 @@ bool Target::removeBuildConfiguration(BuildConfiguration *bc)
return true;
}
QList<BuildConfiguration *> Target::buildConfigurations() const
const QList<BuildConfiguration *> Target::buildConfigurations() const
{
return d->m_buildConfigurations;
}
@@ -385,7 +385,7 @@ bool Target::removeDeployConfiguration(DeployConfiguration *dc)
return true;
}
QList<DeployConfiguration *> Target::deployConfigurations() const
const QList<DeployConfiguration *> Target::deployConfigurations() const
{
return d->m_deployConfigurations;
}
@@ -406,7 +406,7 @@ void Target::setActiveDeployConfiguration(DeployConfiguration *dc)
updateDeviceState();
}
QList<RunConfiguration *> Target::runConfigurations() const
const QList<RunConfiguration *> Target::runConfigurations() const
{
return d->m_runConfigurations;
}

6
src/plugins/projectexplorer/target.h
View File

@@ -71,18 +71,18 @@ public:
void addBuildConfiguration(BuildConfiguration *bc);
bool removeBuildConfiguration(BuildConfiguration *bc);
QList<BuildConfiguration *> buildConfigurations() const;
const QList<BuildConfiguration *> buildConfigurations() const;
BuildConfiguration *activeBuildConfiguration() const;
// DeployConfiguration
void addDeployConfiguration(DeployConfiguration *dc);
bool removeDeployConfiguration(DeployConfiguration *dc);
QList<DeployConfiguration *> deployConfigurations() const;
const QList<DeployConfiguration *> deployConfigurations() const;
DeployConfiguration *activeDeployConfiguration() const;
// Running
QList<RunConfiguration *> runConfigurations() const;
const QList<RunConfiguration *> runConfigurations() const;
void addRunConfiguration(RunConfiguration *rc);
void removeRunConfiguration(RunConfiguration *rc);

2
src/plugins/valgrind/memchecktool.cpp
View File

@@ -350,7 +350,7 @@ bool MemcheckErrorFilterProxyModel::filterAcceptsRow(int sourceRow, const QModel
if (file.isExecutable())
validFolders << file.remoteDirectory();
}
foreach (BuildConfiguration *config, target->buildConfigurations())
for (BuildConfiguration *config : target->buildConfigurations())
validFolders << config->buildDirectory().toString();
}
}