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

Remove BuildStepConfigWidget::init()

Browse Source 
It serves no purpose anymore.

Change-Id: Ifc15b29c7736bacde3b310e6c4dc980314145d14
Reviewed-on: http://codereview.qt.nokia.com/217
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
dt_
2011-05-30 13:30:10 +02:00
committed by Daniel Teske
parent 8ea4b9700d
commit 2cc7bea066
22 changed files with 42 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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*)));

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

@@ -100,7 +100,6 @@ class MakeStepConfigWidget :public ProjectExplorer::BuildStepConfigWidget
public:
MakeStepConfigWidget(MakeStep *makeStep);
virtual QString displayName() const;
virtual void init();
virtual QString summaryText() const;
private slots:
void itemChanged(QListWidgetItem*);