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

QbsProjectManager: Modernize qbsrunconfiguration.{h,cpp}

Browse Source 
Qt 5 connects, some auto, remove unused members, etc.

Change-Id: Ic9daaf0356d9a9e29f55467360674edc66be83ee
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
hjk
2016-01-06 17:58:59 +01:00
parent 2b69693828
commit 049ffa2c10
2 changed files with 42 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
View File

@@ -179,17 +179,22 @@ void QbsRunConfiguration::ctor()
QWidget *QbsRunConfiguration::createConfigurationWidget() QWidget *QbsRunConfiguration::createConfigurationWidget()
{ {
return new QbsRunConfigurationWidget(this, 0); return new QbsRunConfigurationWidget(this);
} }
void QbsRunConfiguration::installStepChanged() void QbsRunConfiguration::installStepChanged()
{ {
if (m_currentInstallStep) if (m_currentInstallStep)
disconnect(m_currentInstallStep, SIGNAL(changed()), this, SIGNAL(targetInformationChanged())); disconnect(m_currentInstallStep, &QbsInstallStep::changed,
this, &QbsRunConfiguration::targetInformationChanged);
if (m_currentBuildStepList) { if (m_currentBuildStepList) {
disconnect(m_currentBuildStepList, SIGNAL(stepInserted(int)), this, SLOT(installStepChanged())); disconnect(m_currentBuildStepList, &BuildStepList::stepInserted,
disconnect(m_currentBuildStepList, SIGNAL(stepRemoved(int)), this, SLOT(installStepChanged())); this, &QbsRunConfiguration::installStepChanged);
disconnect(m_currentBuildStepList, SIGNAL(stepMoved(int,int)), this, SLOT(installStepChanged())); disconnect(m_currentBuildStepList, &BuildStepList::stepRemoved,
this, &QbsRunConfiguration::installStepChanged);
disconnect(m_currentBuildStepList, &BuildStepList::stepMoved,
this, &QbsRunConfiguration::installStepChanged);
} }
QbsDeployConfiguration *activeDc = qobject_cast<QbsDeployConfiguration *>(target()->activeDeployConfiguration()); QbsDeployConfiguration *activeDc = qobject_cast<QbsDeployConfiguration *>(target()->activeDeployConfiguration());
@@ -197,14 +202,18 @@ void QbsRunConfiguration::installStepChanged()
m_currentInstallStep = activeDc ? activeDc->qbsInstallStep() : 0; m_currentInstallStep = activeDc ? activeDc->qbsInstallStep() : 0;
if (m_currentInstallStep) if (m_currentInstallStep)
connect(m_currentInstallStep, SIGNAL(changed()), this, SIGNAL(targetInformationChanged())); connect(m_currentInstallStep, &QbsInstallStep::changed,
this, &QbsRunConfiguration::targetInformationChanged);
if (m_currentBuildStepList) { if (m_currentBuildStepList) {
connect(m_currentBuildStepList, SIGNAL(stepInserted(int)), this, SLOT(installStepChanged())); connect(m_currentBuildStepList, &BuildStepList::stepInserted,
connect(m_currentBuildStepList, SIGNAL(aboutToRemoveStep(int)), this, this, &QbsRunConfiguration::installStepChanged);
SLOT(installStepToBeRemoved(int))); connect(m_currentBuildStepList, &BuildStepList::aboutToRemoveStep, this,
connect(m_currentBuildStepList, SIGNAL(stepRemoved(int)), this, SLOT(installStepChanged())); &QbsRunConfiguration::installStepToBeRemoved);
connect(m_currentBuildStepList, SIGNAL(stepMoved(int,int)), this, SLOT(installStepChanged())); connect(m_currentBuildStepList, &BuildStepList::stepRemoved,
this, &QbsRunConfiguration::installStepChanged);
connect(m_currentBuildStepList, &BuildStepList::stepMoved,
this, &QbsRunConfiguration::installStepChanged);
} }
emit targetInformationChanged(); emit targetInformationChanged();
@@ -217,7 +226,8 @@ void QbsRunConfiguration::installStepToBeRemoved(int pos)
// but we ignore all but the first one. // but we ignore all but the first one.
if (m_currentBuildStepList->steps().at(pos) != m_currentInstallStep) if (m_currentBuildStepList->steps().at(pos) != m_currentInstallStep)
return; return;
disconnect(m_currentInstallStep, SIGNAL(changed()), this, SIGNAL(targetInformationChanged())); disconnect(m_currentInstallStep, &QbsInstallStep::changed,
this, &QbsRunConfiguration::targetInformationChanged);
m_currentInstallStep = 0; m_currentInstallStep = 0;
} }
@@ -264,11 +274,6 @@ QString QbsRunConfiguration::commandLineArguments() const
return extraAspect<ArgumentsAspect>()->arguments(); return extraAspect<ArgumentsAspect>()->arguments();
} }
void QbsRunConfiguration::setRunMode(ApplicationLauncher::Mode runMode)
{
extraAspect<TerminalAspect>()->setRunMode(runMode);
}
void QbsRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const void QbsRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const
{ {
QbsProject *project = static_cast<QbsProject *>(target()->project()); QbsProject *project = static_cast<QbsProject *>(target()->project());
@@ -329,16 +334,13 @@ Utils::OutputFormatter *QbsRunConfiguration::createOutputFormatter() const
// QbsRunConfigurationWidget: // QbsRunConfigurationWidget:
// -------------------------------------------------------------------- // --------------------------------------------------------------------
QbsRunConfigurationWidget::QbsRunConfigurationWidget(QbsRunConfiguration *rc, QWidget *parent) QbsRunConfigurationWidget::QbsRunConfigurationWidget(QbsRunConfiguration *rc)
: QWidget(parent), : m_rc(rc)
m_rc(rc),
m_ignoreChange(false),
m_isShown(false)
{ {
QVBoxLayout *vboxTopLayout = new QVBoxLayout(this); auto vboxTopLayout = new QVBoxLayout(this);
vboxTopLayout->setMargin(0); vboxTopLayout->setMargin(0);
QHBoxLayout *hl = new QHBoxLayout(); auto hl = new QHBoxLayout();
hl->addStretch(); hl->addStretch();
m_disabledIcon = new QLabel(this); m_disabledIcon = new QLabel(this);
m_disabledIcon->setPixmap(Core::Icons::WARNING.pixmap()); m_disabledIcon->setPixmap(Core::Icons::WARNING.pixmap());
@@ -349,12 +351,12 @@ QbsRunConfigurationWidget::QbsRunConfigurationWidget(QbsRunConfiguration *rc, QW
hl->addStretch(); hl->addStretch();
vboxTopLayout->addLayout(hl); vboxTopLayout->addLayout(hl);
m_detailsContainer = new Utils::DetailsWidget(this); auto detailsContainer = new Utils::DetailsWidget(this);
m_detailsContainer->setState(Utils::DetailsWidget::NoSummary); detailsContainer->setState(Utils::DetailsWidget::NoSummary);
vboxTopLayout->addWidget(m_detailsContainer); vboxTopLayout->addWidget(detailsContainer);
QWidget *detailsWidget = new QWidget(m_detailsContainer); auto detailsWidget = new QWidget(detailsContainer);
m_detailsContainer->setWidget(detailsWidget); detailsContainer->setWidget(detailsWidget);
QFormLayout *toplayout = new QFormLayout(detailsWidget); auto toplayout = new QFormLayout(detailsWidget);
toplayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); toplayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
toplayout->setMargin(0); toplayout->setMargin(0);
@@ -370,11 +372,11 @@ QbsRunConfigurationWidget::QbsRunConfigurationWidget(QbsRunConfiguration *rc, QW
runConfigurationEnabledChange(); runConfigurationEnabledChange();
connect(m_rc, SIGNAL(targetInformationChanged()), connect(m_rc, &QbsRunConfiguration::targetInformationChanged,
this, SLOT(targetInformationHasChanged()), Qt::QueuedConnection); this, &QbsRunConfigurationWidget::targetInformationHasChanged, Qt::QueuedConnection);
connect(m_rc, SIGNAL(enabledChanged()), connect(m_rc, &RunConfiguration::enabledChanged,
this, SLOT(runConfigurationEnabledChange())); this, &QbsRunConfigurationWidget::runConfigurationEnabledChange);
} }
void QbsRunConfigurationWidget::runConfigurationEnabledChange() void QbsRunConfigurationWidget::runConfigurationEnabledChange()

22
src/plugins/qbsprojectmanager/qbsrunconfiguration.h
View File

@@ -46,10 +46,7 @@ QT_END_NAMESPACE
namespace qbs { class InstallOptions; } namespace qbs { class InstallOptions; }
namespace Utils { namespace Utils { class PathChooser; }
class PathChooser;
class DetailsWidget;
}
namespace ProjectExplorer { class BuildStepList; } namespace ProjectExplorer { class BuildStepList; }
@@ -84,8 +81,6 @@ public:
Utils::OutputFormatter *createOutputFormatter() const override; Utils::OutputFormatter *createOutputFormatter() const override;
void setRunMode(ProjectExplorer::ApplicationLauncher::Mode runMode);
void addToBaseEnvironment(Utils::Environment &env) const override; void addToBaseEnvironment(Utils::Environment &env) const override;
QString uniqueProductName() const; QString uniqueProductName() const;
@@ -125,24 +120,19 @@ class QbsRunConfigurationWidget : public QWidget
Q_OBJECT Q_OBJECT
public: public:
QbsRunConfigurationWidget(QbsRunConfiguration *rc, QWidget *parent); QbsRunConfigurationWidget(QbsRunConfiguration *rc);
private slots:
void runConfigurationEnabledChange();
void targetInformationHasChanged();
private: private:
void runConfigurationEnabledChange();
void targetInformationHasChanged();
void setExecutableLineText(const QString &text = QString()); void setExecutableLineText(const QString &text = QString());
QbsRunConfiguration *m_rc; QbsRunConfiguration *m_rc;
bool m_ignoreChange; bool m_ignoreChange = false;
QLabel *m_disabledIcon; QLabel *m_disabledIcon;
QLabel *m_disabledReason; QLabel *m_disabledReason;
QLabel *m_executableLineLabel; QLabel *m_executableLineLabel;
QCheckBox *m_usingDyldImageSuffix; bool m_isShown = false;
QLineEdit *m_qmlDebugPort;
Utils::DetailsWidget *m_detailsContainer;
bool m_isShown;
}; };
class QbsRunConfigurationFactory : public ProjectExplorer::IRunConfigurationFactory class QbsRunConfigurationFactory : public ProjectExplorer::IRunConfigurationFactory