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

CMake MakeStep update connections

Browse Source 
Also connection to setUseNinja was replaced by signal emitted inside it

Change-Id: I8185568d88cd1c5f0603931e3104136e59f1da7c
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Nikita Baryshnikov
2014-09-15 11:17:31 +04:00
committed by hjk
parent b26a17f30d
commit 2001a7c702
2 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/plugins/cmakeprojectmanager/makestep.cpp
View File

@@ -98,18 +98,17 @@ void MakeStep::ctor()
CMakeBuildConfiguration *bc = cmakeBuildConfiguration(); CMakeBuildConfiguration *bc = cmakeBuildConfiguration();
if (bc) { if (bc) {
m_activeConfiguration = 0; m_activeConfiguration = 0;
connect(bc, SIGNAL(useNinjaChanged(bool)), this, SLOT(setUseNinja())); connect(bc, &CMakeBuildConfiguration::useNinjaChanged, this, &MakeStep::makeCommandChanged);
} else { } else {
// That means the step is in the deploylist, so we listen to the active build config // That means the step is in the deploylist, so we listen to the active build config
// changed signal and react to the activeBuildConfigurationChanged() signal of the buildconfiguration // changed signal and react to the activeBuildConfigurationChanged() signal of the buildconfiguration
m_activeConfiguration = targetsActiveBuildConfiguration(); m_activeConfiguration = targetsActiveBuildConfiguration();
connect (target(), SIGNAL(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)), connect(target(), &Target::activeBuildConfigurationChanged, this, &MakeStep::activeBuildConfigurationChanged);
this, SLOT(activeBuildConfigurationChanged()));
activeBuildConfigurationChanged(); activeBuildConfigurationChanged();
} }
connect(static_cast<CMakeProject *>(project()), SIGNAL(buildTargetsChanged()), connect(static_cast<CMakeProject *>(project()), &CMakeProject::buildTargetsChanged,
this, SLOT(buildTargetsChanged())); this, &MakeStep::buildTargetsChanged);
} }
MakeStep::~MakeStep() MakeStep::~MakeStep()
@@ -129,12 +128,12 @@ CMakeBuildConfiguration *MakeStep::targetsActiveBuildConfiguration() const
void MakeStep::activeBuildConfigurationChanged() void MakeStep::activeBuildConfigurationChanged()
{ {
if (m_activeConfiguration) if (m_activeConfiguration)
disconnect(m_activeConfiguration, SIGNAL(useNinjaChanged(bool)), this, SLOT(setUseNinja(bool))); disconnect(m_activeConfiguration, &CMakeBuildConfiguration::useNinjaChanged, this, &MakeStep::makeCommandChanged);
m_activeConfiguration = targetsActiveBuildConfiguration(); m_activeConfiguration = targetsActiveBuildConfiguration();
if (m_activeConfiguration) if (m_activeConfiguration)
connect(m_activeConfiguration, SIGNAL(useNinjaChanged(bool)), this, SLOT(setUseNinja(bool))); connect(m_activeConfiguration, &CMakeBuildConfiguration::useNinjaChanged, this, &MakeStep::makeCommandChanged);
emit makeCommandChanged(); emit makeCommandChanged();
} }
@@ -317,11 +316,6 @@ QString MakeStep::makeCommand(ProjectExplorer::ToolChain *tc, const Utils::Envir
return QLatin1String("make"); return QLatin1String("make");
} }
void MakeStep::setUseNinja()
{
emit makeCommandChanged();
}
// //
// MakeStepConfigWidget // MakeStepConfigWidget
// //
@@ -362,15 +356,15 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
updateDetails(); updateDetails();
connect(m_additionalArguments, SIGNAL(textEdited(QString)), this, SLOT(additionalArgumentsEdited())); connect(m_additionalArguments, &QLineEdit::textEdited, this, &MakeStepConfigWidget::additionalArgumentsEdited);
connect(m_buildTargetsList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*))); connect(m_buildTargetsList, &QListWidget::itemChanged, this, &MakeStepConfigWidget::itemChanged);
connect(ProjectExplorer::ProjectExplorerPlugin::instance(), SIGNAL(settingsChanged()), connect(ProjectExplorer::ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::settingsChanged,
this, SLOT(updateDetails())); this, &MakeStepConfigWidget::updateDetails);
connect(pro, SIGNAL(buildTargetsChanged()), this, SLOT(buildTargetsChanged())); connect(pro, &CMakeProject::buildTargetsChanged, this, &MakeStepConfigWidget::buildTargetsChanged);
connect(m_makeStep, SIGNAL(targetsToBuildChanged()), this, SLOT(selectedBuildTargetsChanged())); connect(m_makeStep, &MakeStep::targetsToBuildChanged, this, &MakeStepConfigWidget::selectedBuildTargetsChanged);
connect(pro, SIGNAL(environmentChanged()), this, SLOT(updateDetails())); connect(pro, &CMakeProject::environmentChanged, this, &MakeStepConfigWidget::updateDetails);
connect(m_makeStep, SIGNAL(makeCommandChanged()), this, SLOT(updateDetails())); connect(m_makeStep, &MakeStep::makeCommandChanged, this, &MakeStepConfigWidget::updateDetails);
} }
void MakeStepConfigWidget::additionalArgumentsEdited() void MakeStepConfigWidget::additionalArgumentsEdited()
@@ -392,7 +386,7 @@ QString MakeStepConfigWidget::displayName() const
void MakeStepConfigWidget::buildTargetsChanged() void MakeStepConfigWidget::buildTargetsChanged()
{ {
disconnect(m_buildTargetsList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*))); disconnect(m_buildTargetsList, &QListWidget::itemChanged, this, &MakeStepConfigWidget::itemChanged);
m_buildTargetsList->clear(); m_buildTargetsList->clear();
CMakeProject *pro = static_cast<CMakeProject *>(m_makeStep->target()->project()); CMakeProject *pro = static_cast<CMakeProject *>(m_makeStep->target()->project());
foreach (const QString& buildTarget, pro->buildTargetTitles()) { foreach (const QString& buildTarget, pro->buildTargetTitles()) {
@@ -400,18 +394,18 @@ void MakeStepConfigWidget::buildTargetsChanged()
item->setFlags(item->flags() | Qt::ItemIsUserCheckable); item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
item->setCheckState(m_makeStep->buildsBuildTarget(item->text()) ? Qt::Checked : Qt::Unchecked); item->setCheckState(m_makeStep->buildsBuildTarget(item->text()) ? Qt::Checked : Qt::Unchecked);
} }
connect(m_buildTargetsList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*))); connect(m_buildTargetsList, &QListWidget::itemChanged, this, &MakeStepConfigWidget::itemChanged);
updateSummary(); updateSummary();
} }
void MakeStepConfigWidget::selectedBuildTargetsChanged() void MakeStepConfigWidget::selectedBuildTargetsChanged()
{ {
disconnect(m_buildTargetsList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*))); disconnect(m_buildTargetsList, &QListWidget::itemChanged, this, &MakeStepConfigWidget::itemChanged);
for (int y = 0; y < m_buildTargetsList->count(); ++y) { for (int y = 0; y < m_buildTargetsList->count(); ++y) {
QListWidgetItem *item = m_buildTargetsList->itemAt(0, y); QListWidgetItem *item = m_buildTargetsList->itemAt(0, y);
item->setCheckState(m_makeStep->buildsBuildTarget(item->text()) ? Qt::Checked : Qt::Unchecked); item->setCheckState(m_makeStep->buildsBuildTarget(item->text()) ? Qt::Checked : Qt::Unchecked);
} }
connect(m_buildTargetsList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*))); connect(m_buildTargetsList, &QListWidget::itemChanged, this, &MakeStepConfigWidget::itemChanged);
updateSummary(); updateSummary();
} }

10
src/plugins/cmakeprojectmanager/makestep.h
View File

@@ -79,11 +79,8 @@ public:
QVariantMap toMap() const; QVariantMap toMap() const;
public slots: private:
void setUseNinja();
void activeBuildConfigurationChanged(); void activeBuildConfigurationChanged();
private slots:
void buildTargetsChanged(); void buildTargetsChanged();
signals: signals:
@@ -116,14 +113,15 @@ private:
CMakeBuildConfiguration *m_activeConfiguration; CMakeBuildConfiguration *m_activeConfiguration;
}; };
class MakeStepConfigWidget :public ProjectExplorer::BuildStepConfigWidget class MakeStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
MakeStepConfigWidget(MakeStep *makeStep); MakeStepConfigWidget(MakeStep *makeStep);
virtual QString displayName() const; virtual QString displayName() const;
virtual QString summaryText() const; virtual QString summaryText() const;
private slots:
private:
void itemChanged(QListWidgetItem*); void itemChanged(QListWidgetItem*);
void additionalArgumentsEdited(); void additionalArgumentsEdited();
void updateDetails(); void updateDetails();