From c265803a7a284973cf252184afeff5dcfcb03e09 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 12 Jun 2013 17:30:22 +0200 Subject: [PATCH] Qbs: Remove some dead code Change-Id: I94fee7575bb39721391da2c0f5df669172b71028 Reviewed-by: Tobias Hunger --- .../qbsprojectmanager/qbsprojectmanager.pro | 3 +- .../qbsprojectmanager/qbsprojectmanager.qbs | 3 +- src/plugins/qbsprojectmanager/qbsstep.cpp | 100 ------------------ src/plugins/qbsprojectmanager/qbsstep.h | 35 ------ .../qbsprojectmanager/qbsstepconfigwidget.ui | 80 -------------- 5 files changed, 2 insertions(+), 219 deletions(-) delete mode 100644 src/plugins/qbsprojectmanager/qbsstepconfigwidget.ui diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.pro b/src/plugins/qbsprojectmanager/qbsprojectmanager.pro index 5cdd7a1fcbd..0ee60584b07 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager.pro +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.pro @@ -54,5 +54,4 @@ SOURCES = \ FORMS = \ qbsbuildstepconfigwidget.ui \ qbscleanstepconfigwidget.ui \ - qbsinstallstepconfigwidget.ui \ - qbsstepconfigwidget.ui + qbsinstallstepconfigwidget.ui diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs index e6d84007d06..0053d714627 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs @@ -84,8 +84,7 @@ QtcPlugin { "qbsrunconfiguration.cpp", "qbsrunconfiguration.h", "qbsstep.cpp", - "qbsstep.h", - "qbsstepconfigwidget.ui" + "qbsstep.h" ] } diff --git a/src/plugins/qbsprojectmanager/qbsstep.cpp b/src/plugins/qbsprojectmanager/qbsstep.cpp index cd736678ad3..77128e89c7a 100644 --- a/src/plugins/qbsprojectmanager/qbsstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsstep.cpp @@ -240,105 +240,5 @@ void QbsStep::setMaxJobs(int jobcount) emit qbsBuildOptionsChanged(); } -// -------------------------------------------------------------------- -// QbsStepConfigWidget: -// -------------------------------------------------------------------- - -QbsStepConfigWidget::QbsStepConfigWidget(QbsStep *step) : - m_step(step) -{ - connect(m_step, SIGNAL(displayNameChanged()), this, SLOT(updateState())); - connect(m_step, SIGNAL(qbsBuildOptionsChanged()), this, SLOT(updateState())); - - setContentsMargins(0, 0, 0, 0); - - m_ui = new Ui::QbsStepConfigWidget; - m_ui->setupUi(this); - - connect(m_ui->dryRunCheckBox, SIGNAL(toggled(bool)), this, SLOT(changeDryRun(bool))); - connect(m_ui->keepGoingCheckBox, SIGNAL(toggled(bool)), this, SLOT(changeKeepGoing(bool))); - connect(m_ui->jobSpinBox, SIGNAL(valueChanged(int)), this, SLOT(changeJobCount(int))); - - QTimer::singleShot(0, this, SLOT(updateState())); -} - -QString QbsStepConfigWidget::summaryText() const -{ - return m_summary; -} - -QString QbsStepConfigWidget::displayName() const -{ - return m_step->displayName(); -} - -void QbsStepConfigWidget::updateState() -{ - m_ui->dryRunCheckBox->setChecked(m_step->dryRun()); - m_ui->keepGoingCheckBox->setChecked(m_step->keepGoing()); - m_ui->jobSpinBox->setValue(m_step->maxJobs()); - - QString command = QLatin1String("qbs"); - - const QString qbsCmd = qbsCommand(); - if (!qbsCmd.isEmpty()) { - command += QLatin1String(" "); - command += qbsCmd; - } - - const QString buildDir = m_step->target()->activeBuildConfiguration()->buildDirectory(); - const QString sourceDir = m_step->project()->projectDirectory(); - if (buildDir != sourceDir) - command += QString::fromLatin1(" -f \"%1\"").arg(QDir(buildDir).relativeFilePath(sourceDir)); - - if (m_step->dryRun()) - command += QLatin1String(" --dry-run"); - if (m_step->keepGoing()) - command += QLatin1String(" --keep-going"); - if (m_step->maxJobs() != QbsManager::preferences()->jobs()) - command += QString::fromLatin1(" --jobs %1").arg(m_step->maxJobs()); - - - const QString args = additionalQbsArguments(); - if (!args.isEmpty()) { - command += QLatin1String(" "); - command += args; - } - - QString summary = tr("Qbs: %1").arg(command); - if (m_summary != summary) { - m_summary = summary; - emit updateSummary(); - } -} - -void QbsStepConfigWidget::changeDryRun(bool dr) -{ - m_step->setDryRun(dr); -} - -void QbsStepConfigWidget::changeKeepGoing(bool kg) -{ - m_step->setKeepGoing(kg); -} - -void QbsStepConfigWidget::changeJobCount(int count) -{ - m_step->setMaxJobs(count); -} - -void QbsStepConfigWidget::addWidget(QWidget *widget) -{ - if (widget) - static_cast(layout())->insertWidget(0, widget); - updateState(); -} - -void QbsStepConfigWidget::setJobCountUiVisible(bool show) -{ - m_ui->jobSpinBox->setVisible(show); - m_ui->jobLabel->setVisible(show); -} - } // namespace Internal } // namespace QbsProjectManager diff --git a/src/plugins/qbsprojectmanager/qbsstep.h b/src/plugins/qbsprojectmanager/qbsstep.h index 0a28abcdfd9..3728f237b12 100644 --- a/src/plugins/qbsprojectmanager/qbsstep.h +++ b/src/plugins/qbsprojectmanager/qbsstep.h @@ -102,41 +102,6 @@ private: friend class QbsStepConfigWidget; }; -namespace Ui { class QbsStepConfigWidget; } - -class QbsStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget -{ - Q_OBJECT -public: - QbsStepConfigWidget(QbsStep *step); - QString summaryText() const; - QString displayName() const; - -private slots: - - void changeDryRun(bool dr); - void changeKeepGoing(bool kg); - void changeJobCount(int count); - -protected slots: - void updateState(); - -protected: - void addWidget(QWidget *widget); - void setJobCountUiVisible(bool show); - - virtual QString qbsCommand() const = 0; - virtual QString additionalQbsArguments() const = 0; - - QbsStep *buildStep() const { return m_step; } - -private: - Ui::QbsStepConfigWidget *m_ui; - - QbsStep *m_step; - QString m_summary; -}; - } // namespace Internal } // namespace QbsProjectManager diff --git a/src/plugins/qbsprojectmanager/qbsstepconfigwidget.ui b/src/plugins/qbsprojectmanager/qbsstepconfigwidget.ui deleted file mode 100644 index 9558ff8beca..00000000000 --- a/src/plugins/qbsprojectmanager/qbsstepconfigwidget.ui +++ /dev/null @@ -1,80 +0,0 @@ - - - QbsProjectManager::Internal::QbsStepConfigWidget - - - - 0 - 0 - 344 - 45 - - - - - 10 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - Dry run - - - - - - - Keep Going - - - - - - - - - 1 - - - 9999 - - - - - - - jobs - - - - - - - - - - - - -