aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2020-02-28 16:58:37 +0100
committerhjk <hjk@qt.io>2020-03-02 11:54:00 +0000
commit6164378372527db9f4c22f03f5ec18b5818de03a (patch)
tree7eabffcfb3bb4707ae7707578ebc7e52ad94cedc /src
parent6d169ae7aa6907066c23871d52316ac6d83226e9 (diff)
ProjectExplorer: Replace a few foreach()
Change-Id: I445cdfaac13ac894be3cd6fc8c20b4a09f460a01 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/projectexplorer/buildsettingspropertiespage.cpp2
-rw-r--r--src/plugins/projectexplorer/miniprojecttargetselector.cpp18
-rw-r--r--src/plugins/projectexplorer/project.cpp6
-rw-r--r--src/plugins/projectexplorer/session.cpp4
-rw-r--r--src/plugins/projectexplorer/target.cpp6
-rw-r--r--src/plugins/projectexplorer/target.h6
-rw-r--r--src/plugins/valgrind/memchecktool.cpp2
7 files changed, 22 insertions, 22 deletions
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
index 924adfa678..b0f4ce758a 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
@@ -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());
diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
index 4d47ff0191..342c877526 100644
--- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp
+++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
@@ -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());
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index 5aa448b03b..292f81a4cd 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -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();
diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp
index bb3bc8b8dc..f76d15531e 100644
--- a/src/plugins/projectexplorer/session.cpp
+++ b/src/plugins/projectexplorer/session.cpp
@@ -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;
diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp
index fc0b87e727..b3f04c646f 100644
--- a/src/plugins/projectexplorer/target.cpp
+++ b/src/plugins/projectexplorer/target.cpp
@@ -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;
}
diff --git a/src/plugins/projectexplorer/target.h b/src/plugins/projectexplorer/target.h
index 2e452fac22..1e31c47bda 100644
--- a/src/plugins/projectexplorer/target.h
+++ b/src/plugins/projectexplorer/target.h
@@ -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);
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index fd8025fc8b..c5073bd40f 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -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();
}
}