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

MiniProjectTargetSelector: Simplify code

Browse Source 
Change-Id: Ie28efa6deb29801dd670656eeeeef81ccc4ae87f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-05-09 13:53:26 +02:00
parent 96df9f9189
commit ae95074b17
2 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -719,13 +719,23 @@ MiniProjectTargetSelector::MiniProjectTargetSelector(QAction *targetSelectorActi
this, &MiniProjectTargetSelector::kitChanged); this, &MiniProjectTargetSelector::kitChanged);
connect(m_listWidgets[TARGET], &GenericListWidget::changeActiveProjectConfiguration, connect(m_listWidgets[TARGET], &GenericListWidget::changeActiveProjectConfiguration,
this, &MiniProjectTargetSelector::setActiveTarget); this, [this](ProjectConfiguration *pc) {
SessionManager::setActiveTarget(m_project, static_cast<Target *>(pc), SetActive::Cascade);
});
connect(m_listWidgets[BUILD], &GenericListWidget::changeActiveProjectConfiguration, connect(m_listWidgets[BUILD], &GenericListWidget::changeActiveProjectConfiguration,
this, &MiniProjectTargetSelector::setActiveBuildConfiguration); this, [this](ProjectConfiguration *pc) {
SessionManager::setActiveBuildConfiguration(m_project->activeTarget(),
static_cast<BuildConfiguration *>(pc), SetActive::Cascade);
});
connect(m_listWidgets[DEPLOY], &GenericListWidget::changeActiveProjectConfiguration, connect(m_listWidgets[DEPLOY], &GenericListWidget::changeActiveProjectConfiguration,
this, &MiniProjectTargetSelector::setActiveDeployConfiguration); this, [this](ProjectConfiguration *pc) {
SessionManager::setActiveDeployConfiguration(m_project->activeTarget(),
static_cast<DeployConfiguration *>(pc), SetActive::Cascade);
});
connect(m_listWidgets[RUN], &GenericListWidget::changeActiveProjectConfiguration, connect(m_listWidgets[RUN], &GenericListWidget::changeActiveProjectConfiguration,
this, &MiniProjectTargetSelector::setActiveRunConfiguration); this, [this](ProjectConfiguration *pc) {
m_project->activeTarget()->setActiveRunConfiguration(static_cast<RunConfiguration *>(pc));
});
} }
bool MiniProjectTargetSelector::event(QEvent *event) bool MiniProjectTargetSelector::event(QEvent *event)
@@ -959,27 +969,6 @@ void MiniProjectTargetSelector::doLayout(bool keepSize)
move(moveTo); move(moveTo);
} }
void MiniProjectTargetSelector::setActiveTarget(ProjectConfiguration *pc)
{
SessionManager::setActiveTarget(m_project, static_cast<Target *>(pc),
SetActive::Cascade);
}
void MiniProjectTargetSelector::setActiveBuildConfiguration(ProjectConfiguration *pc)
{
SessionManager::setActiveBuildConfiguration(m_target, static_cast<BuildConfiguration *>(pc), SetActive::Cascade);
}
void MiniProjectTargetSelector::setActiveDeployConfiguration(ProjectConfiguration *pc)
{
SessionManager::setActiveDeployConfiguration(m_target, static_cast<DeployConfiguration *>(pc), SetActive::Cascade);
}
void MiniProjectTargetSelector::setActiveRunConfiguration(ProjectConfiguration *pc)
{
m_target->setActiveRunConfiguration(static_cast<RunConfiguration *>(pc));
}
void MiniProjectTargetSelector::projectAdded(Project *project) void MiniProjectTargetSelector::projectAdded(Project *project)
{ {
connect(project, &Project::addedTarget, connect(project, &Project::addedTarget,

5
src/plugins/projectexplorer/miniprojecttargetselector.h
View File

@@ -164,11 +164,6 @@ private:
void activeDeployConfigurationChanged(ProjectExplorer::DeployConfiguration *dc); void activeDeployConfigurationChanged(ProjectExplorer::DeployConfiguration *dc);
void activeRunConfigurationChanged(ProjectExplorer::RunConfiguration *rc); void activeRunConfigurationChanged(ProjectExplorer::RunConfiguration *rc);
void setActiveTarget(ProjectExplorer::ProjectConfiguration *pc);
void setActiveBuildConfiguration(ProjectExplorer::ProjectConfiguration *pc);
void setActiveDeployConfiguration(ProjectExplorer::ProjectConfiguration *pc);
void setActiveRunConfiguration(ProjectExplorer::ProjectConfiguration *pc);
void delayedHide(); void delayedHide();
void updateActionAndSummary(); void updateActionAndSummary();
void switchToProjectsMode(); void switchToProjectsMode();