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

ProjectExplorer: Remove Target::*ProjectConfiguration(...) signals

Browse Source 
The only listener left is the target's project, which is known at each
emitting location and can be called directly.

Change-Id: If07d2c1c43fcf5d2094c0b6d59f773d12b4f6d6b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-07-31 18:43:13 +02:00
parent 79f9449f68
commit 4c80380478
3 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -260,10 +260,6 @@ void Project::addTarget(std::unique_ptr<Target> &&t)
// add it // add it
d->m_targets.emplace_back(std::move(t)); d->m_targets.emplace_back(std::move(t));
connect(pointer, &Target::addedProjectConfiguration, this, &Project::addedProjectConfiguration);
connect(pointer, &Target::aboutToRemoveProjectConfiguration, this, &Project::aboutToRemoveProjectConfiguration);
connect(pointer, &Target::removedProjectConfiguration, this, &Project::removedProjectConfiguration);
connect(pointer, &Target::activeProjectConfigurationChanged, this, &Project::activeProjectConfigurationChanged);
emit addedTarget(pointer); emit addedTarget(pointer);
// check activeTarget: // check activeTarget:

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

@@ -151,7 +151,6 @@ Target::Target(Project *project, Kit *k, _constructor_tag) :
QCoreApplication::translate("ProjectExplorer", "Name of current project"), QCoreApplication::translate("ProjectExplorer", "Name of current project"),
[project] { return project->displayName(); }, [project] { return project->displayName(); },
false); false);
} }
Target::~Target() Target::~Target()
@@ -229,7 +228,7 @@ void Target::addBuildConfiguration(BuildConfiguration *bc)
// add it // add it
d->m_buildConfigurations.push_back(bc); d->m_buildConfigurations.push_back(bc);
emit addedProjectConfiguration(bc); project()->addedProjectConfiguration(bc);
emit addedBuildConfiguration(bc); emit addedBuildConfiguration(bc);
d->m_buildConfigurationModel.addProjectConfiguration(bc); d->m_buildConfigurationModel.addProjectConfiguration(bc);
@@ -246,7 +245,7 @@ bool Target::removeBuildConfiguration(BuildConfiguration *bc)
if (BuildManager::isBuilding(bc)) if (BuildManager::isBuilding(bc))
return false; return false;
emit aboutToRemoveProjectConfiguration(bc); project()->aboutToRemoveProjectConfiguration(bc);
d->m_buildConfigurations.removeOne(bc); d->m_buildConfigurations.removeOne(bc);
if (activeBuildConfiguration() == bc) { if (activeBuildConfiguration() == bc) {
@@ -257,7 +256,7 @@ bool Target::removeBuildConfiguration(BuildConfiguration *bc)
} }
emit removedBuildConfiguration(bc); emit removedBuildConfiguration(bc);
emit removedProjectConfiguration(bc); project()->removedProjectConfiguration(bc);
d->m_buildConfigurationModel.removeProjectConfiguration(bc); d->m_buildConfigurationModel.removeProjectConfiguration(bc);
delete bc; delete bc;
@@ -280,7 +279,7 @@ void Target::setActiveBuildConfiguration(BuildConfiguration *bc)
(bc && d->m_buildConfigurations.contains(bc) && (bc && d->m_buildConfigurations.contains(bc) &&
bc != d->m_activeBuildConfiguration)) { bc != d->m_activeBuildConfiguration)) {
d->m_activeBuildConfiguration = bc; d->m_activeBuildConfiguration = bc;
emit activeProjectConfigurationChanged(d->m_activeBuildConfiguration); project()->activeProjectConfigurationChanged(d->m_activeBuildConfiguration);
emit activeBuildConfigurationChanged(d->m_activeBuildConfiguration); emit activeBuildConfigurationChanged(d->m_activeBuildConfiguration);
} }
} }
@@ -299,7 +298,7 @@ void Target::addDeployConfiguration(DeployConfiguration *dc)
// add it // add it
d->m_deployConfigurations.push_back(dc); d->m_deployConfigurations.push_back(dc);
emit addedProjectConfiguration(dc); project()->addedProjectConfiguration(dc);
d->m_deployConfigurationModel.addProjectConfiguration(dc); d->m_deployConfigurationModel.addProjectConfiguration(dc);
emit addedDeployConfiguration(dc); emit addedDeployConfiguration(dc);
@@ -317,7 +316,7 @@ bool Target::removeDeployConfiguration(DeployConfiguration *dc)
if (BuildManager::isBuilding(dc)) if (BuildManager::isBuilding(dc))
return false; return false;
emit aboutToRemoveProjectConfiguration(dc); project()->aboutToRemoveProjectConfiguration(dc);
d->m_deployConfigurations.removeOne(dc); d->m_deployConfigurations.removeOne(dc);
if (activeDeployConfiguration() == dc) { if (activeDeployConfiguration() == dc) {
@@ -328,7 +327,7 @@ bool Target::removeDeployConfiguration(DeployConfiguration *dc)
SetActive::Cascade); SetActive::Cascade);
} }
emit removedProjectConfiguration(dc); project()->removedProjectConfiguration(dc);
d->m_deployConfigurationModel.removeProjectConfiguration(dc); d->m_deployConfigurationModel.removeProjectConfiguration(dc);
emit removedDeployConfiguration(dc); emit removedDeployConfiguration(dc);
@@ -352,7 +351,7 @@ void Target::setActiveDeployConfiguration(DeployConfiguration *dc)
(dc && d->m_deployConfigurations.contains(dc) && (dc && d->m_deployConfigurations.contains(dc) &&
dc != d->m_activeDeployConfiguration)) { dc != d->m_activeDeployConfiguration)) {
d->m_activeDeployConfiguration = dc; d->m_activeDeployConfiguration = dc;
emit activeProjectConfigurationChanged(d->m_activeDeployConfiguration); project()->activeProjectConfigurationChanged(d->m_activeDeployConfiguration);
emit activeDeployConfigurationChanged(d->m_activeDeployConfiguration); emit activeDeployConfigurationChanged(d->m_activeDeployConfiguration);
} }
updateDeviceState(); updateDeviceState();
@@ -418,7 +417,7 @@ void Target::addRunConfiguration(RunConfiguration *rc)
d->m_runConfigurations.push_back(rc); d->m_runConfigurations.push_back(rc);
emit addedProjectConfiguration(rc); project()->addedProjectConfiguration(rc);
d->m_runConfigurationModel.addProjectConfiguration(rc); d->m_runConfigurationModel.addProjectConfiguration(rc);
emit addedRunConfiguration(rc); emit addedRunConfiguration(rc);
@@ -430,7 +429,7 @@ void Target::removeRunConfiguration(RunConfiguration *rc)
{ {
QTC_ASSERT(rc && d->m_runConfigurations.contains(rc), return); QTC_ASSERT(rc && d->m_runConfigurations.contains(rc), return);
emit aboutToRemoveProjectConfiguration(rc); project()->aboutToRemoveProjectConfiguration(rc);
d->m_runConfigurations.removeOne(rc); d->m_runConfigurations.removeOne(rc);
if (activeRunConfiguration() == rc) { if (activeRunConfiguration() == rc) {
@@ -441,7 +440,7 @@ void Target::removeRunConfiguration(RunConfiguration *rc)
} }
emit removedRunConfiguration(rc); emit removedRunConfiguration(rc);
emit removedProjectConfiguration(rc); project()->removedProjectConfiguration(rc);
d->m_runConfigurationModel.removeProjectConfiguration(rc); d->m_runConfigurationModel.removeProjectConfiguration(rc);
delete rc; delete rc;
@@ -458,7 +457,7 @@ void Target::setActiveRunConfiguration(RunConfiguration *rc)
(rc && d->m_runConfigurations.contains(rc) && (rc && d->m_runConfigurations.contains(rc) &&
rc != d->m_activeRunConfiguration)) { rc != d->m_activeRunConfiguration)) {
d->m_activeRunConfiguration = rc; d->m_activeRunConfiguration = rc;
emit activeProjectConfigurationChanged(d->m_activeRunConfiguration); project()->activeProjectConfigurationChanged(d->m_activeRunConfiguration);
emit activeRunConfigurationChanged(d->m_activeRunConfiguration); emit activeRunConfigurationChanged(d->m_activeRunConfiguration);
} }
updateDeviceState(); updateDeviceState();

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

@@ -135,12 +135,6 @@ signals:
void kitChanged(); void kitChanged();
void aboutToRemoveProjectConfiguration(ProjectExplorer::ProjectConfiguration *pc);
void removedProjectConfiguration(ProjectExplorer::ProjectConfiguration *pc);
void addedProjectConfiguration(ProjectExplorer::ProjectConfiguration *pc);
void activeProjectConfigurationChanged(ProjectExplorer::ProjectConfiguration *pc);
// TODO clean up signal names // TODO clean up signal names
// might be better to also have aboutToRemove signals // might be better to also have aboutToRemove signals
void removedRunConfiguration(ProjectExplorer::RunConfiguration *rc); void removedRunConfiguration(ProjectExplorer::RunConfiguration *rc);