aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/cmakeprojectmanager/makestep.cpp
diff options
context:
space:
mode:
authordt_ <[email protected]>2011-05-30 13:30:10 +0200
committerDaniel Teske <[email protected]>2011-05-30 14:44:33 +0200
commit2cc7bea066fab2326944062c618d609fb46426f7 (patch)
treeb07ff3bcf4dcf4dbfc813a624605e3bbc803c964 /src/plugins/cmakeprojectmanager/makestep.cpp
parent8ea4b9700d956b2f9198439bf72dfe951cb8b56a (diff)
Remove BuildStepConfigWidget::init()
It serves no purpose anymore. Change-Id: Ifc15b29c7736bacde3b310e6c4dc980314145d14 Reviewed-on: http://codereview.qt.nokia.com/217 Reviewed-by: Qt Sanity Bot <[email protected]> Reviewed-by: Daniel Teske <[email protected]>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/makestep.cpp')
-rw-r--r--src/plugins/cmakeprojectmanager/makestep.cpp31
1 files changed, 8 insertions, 23 deletions
diff --git a/src/plugins/cmakeprojectmanager/makestep.cpp b/src/plugins/cmakeprojectmanager/makestep.cpp
index 4867c5df5b8..d19610c2641 100644
--- a/src/plugins/cmakeprojectmanager/makestep.cpp
+++ b/src/plugins/cmakeprojectmanager/makestep.cpp
@@ -223,8 +223,7 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
m_additionalArguments = new QLineEdit(this);
fl->addRow(tr("Additional arguments:"), m_additionalArguments);
-
- connect(m_additionalArguments, SIGNAL(textEdited(const QString &)), this, SLOT(additionalArgumentsEdited()));
+ m_additionalArguments->setText(m_makeStep->additionalArguments());
m_buildTargetsList = new QListWidget;
m_buildTargetsList->setMinimumHeight(200);
@@ -236,12 +235,18 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
foreach(const QString& buildTarget, pro->buildTargetTitles()) {
QListWidgetItem *item = new QListWidgetItem(buildTarget, m_buildTargetsList);
item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
- item->setCheckState(Qt::Unchecked);
+ item->setCheckState(m_makeStep->buildsBuildTarget(item->text()) ? Qt::Checked : Qt::Unchecked);
}
+ updateDetails();
+
+ connect(m_additionalArguments, SIGNAL(textEdited(const QString &)), this, SLOT(additionalArgumentsEdited()));
connect(m_buildTargetsList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*)));
connect(ProjectExplorer::ProjectExplorerPlugin::instance(), SIGNAL(settingsChanged()),
this, SLOT(updateDetails()));
+
+ connect(pro, SIGNAL(buildTargetsChanged()),
+ this, SLOT(buildTargetsChanged()));
}
void MakeStepConfigWidget::additionalArgumentsEdited()
@@ -261,26 +266,6 @@ QString MakeStepConfigWidget::displayName() const
return tr("Make", "CMakeProjectManager::MakeStepConfigWidget display name.");
}
-void MakeStepConfigWidget::init()
-{
- // disconnect to make the changes to the items
- disconnect(m_buildTargetsList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*)));
- int count = m_buildTargetsList->count();
- for(int i = 0; i < count; ++i) {
- QListWidgetItem *item = m_buildTargetsList->item(i);
- item->setCheckState(m_makeStep->buildsBuildTarget(item->text()) ? Qt::Checked : Qt::Unchecked);
- }
- // and connect again
- connect(m_buildTargetsList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*)));
-
- m_additionalArguments->setText(m_makeStep->additionalArguments());
- updateDetails();
-
- CMakeProject *pro = m_makeStep->cmakeBuildConfiguration()->cmakeTarget()->cmakeProject();
- connect(pro, SIGNAL(buildTargetsChanged()),
- this, SLOT(buildTargetsChanged()));
-}
-
void MakeStepConfigWidget::buildTargetsChanged()
{
disconnect(m_buildTargetsList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*)));