diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp index 1f7ead2a78e64a5138050a8cd54db67822f37313..4e047434826dc632a9cfcca3004daa559f4cb873 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp @@ -316,7 +316,7 @@ void CMakeRunConfiguration::setEnabled(bool b) if (m_enabled == b) return; m_enabled = b; - emit isEnabledChanged(isEnabled()); + emit enabledChanged(); setDefaultDisplayName(defaultDisplayName()); } diff --git a/src/plugins/madde/maemorunconfigurationwidget.cpp b/src/plugins/madde/maemorunconfigurationwidget.cpp index ee261b5e1bc35822cf6897eda93b640e00355b97..137f19d479ac2beef07c302cd2dee1670a137bfa 100644 --- a/src/plugins/madde/maemorunconfigurationwidget.cpp +++ b/src/plugins/madde/maemorunconfigurationwidget.cpp @@ -93,13 +93,14 @@ MaemoRunConfigurationWidget::MaemoRunConfigurationWidget( = qobject_cast(runConfiguration->target()); m_mountDetailsContainer->setVisible(maemoTarget->allowsRemoteMounts()); - connect(m_runConfiguration, SIGNAL(isEnabledChanged(bool)), - this, SLOT(runConfigurationEnabledChange(bool))); - runConfigurationEnabledChange(m_runConfiguration->isEnabled()); + connect(m_runConfiguration, SIGNAL(enabledChanged()), + this, SLOT(runConfigurationEnabledChange())); + runConfigurationEnabledChange(); } -void MaemoRunConfigurationWidget::runConfigurationEnabledChange(bool enabled) +void MaemoRunConfigurationWidget::runConfigurationEnabledChange() { + bool enabled = m_runConfiguration->isEnabled(); m_subWidget->setEnabled(enabled); } diff --git a/src/plugins/madde/maemorunconfigurationwidget.h b/src/plugins/madde/maemorunconfigurationwidget.h index d25e1b69dbf4b23c3842a72203646a209472fb69..cf738827f5167edf23fd8f840bd2a76b6352365a 100644 --- a/src/plugins/madde/maemorunconfigurationwidget.h +++ b/src/plugins/madde/maemorunconfigurationwidget.h @@ -66,7 +66,7 @@ private slots: void enableOrDisableRemoveMountSpecButton(); void handleRemoteMountsChanged(); void updateMountWarning(); - void runConfigurationEnabledChange(bool enabled); + void runConfigurationEnabledChange(); private: void addMountWidgets(QVBoxLayout *mainLayout); diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 394db5e9c83df40b5a38fd7f164af4430262f497..27904b5bf35ad02c0d457e5c9f2533bfd413a6d0 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -2206,14 +2206,14 @@ void ProjectExplorerPlugin::activeRunConfigurationChanged() if (rc == previousRunConfiguration) return; if (previousRunConfiguration) { - disconnect(previousRunConfiguration, SIGNAL(isEnabledChanged(bool)), + disconnect(previousRunConfiguration, SIGNAL(enabledChanged()), this, SIGNAL(updateRunActions())); disconnect(previousRunConfiguration->debuggerAspect(), SIGNAL(debuggersChanged()), this, SIGNAL(updateRunActions())); } previousRunConfiguration = rc; if (rc) { - connect(rc, SIGNAL(isEnabledChanged(bool)), + connect(rc, SIGNAL(enabledChanged()), this, SIGNAL(updateRunActions())); connect(rc->debuggerAspect(), SIGNAL(debuggersChanged()), this, SIGNAL(updateRunActions())); diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index 4eef069db01c3f475d3208a59af88a4593ff697f..978f01b99a30ce6a4e8c69d437457fd36c5cc2f2 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -178,7 +178,7 @@ public: virtual ProjectExplorer::Abi abi() const; signals: - void isEnabledChanged(bool value); + void enabledChanged(); protected: RunConfiguration(Target *parent, const QString &id); diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index 3899c87435ac0d296b2611e9d5b637b6ea7f565e..8f18d89e9c8be7203ef525940b900a3ceba016f3 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -364,7 +364,7 @@ void QmlProjectRunConfiguration::updateEnabled() // Always emit change signal to force reevaluation of run/debug buttons m_isEnabled = newValue; - emit isEnabledChanged(m_isEnabled); + emit enabledChanged(); } void QmlProjectRunConfiguration::updateQtVersions() diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp index 185fd3d46213c5196fdc2e6ecb158a7def0d5af4..cc61c898697bfe5f88df2194ddd5ddffae8d66a0 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp @@ -165,7 +165,7 @@ void Qt4RunConfiguration::proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *pro, m_parseSuccess = success; m_parseInProgress = parseInProgress; if (enabled != isEnabled()) - emit isEnabledChanged(!enabled); + emit enabledChanged(); if (!parseInProgress) { emit effectiveTargetInformationChanged(); @@ -287,7 +287,7 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run m_environmentWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); vboxTopLayout->addWidget(m_environmentWidget); - runConfigurationEnabledChange(m_qt4RunConfiguration->isEnabled()); + runConfigurationEnabledChange(); connect(m_workingDirectoryEdit, SIGNAL(changed(QString)), this, SLOT(workDirectoryEdited())); @@ -321,8 +321,8 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run connect(qt4RunConfiguration, SIGNAL(baseEnvironmentChanged()), this, SLOT(baseEnvironmentChanged())); - connect(qt4RunConfiguration, SIGNAL(isEnabledChanged(bool)), - this, SLOT(runConfigurationEnabledChange(bool))); + connect(qt4RunConfiguration, SIGNAL(enabledChanged()), + this, SLOT(runConfigurationEnabledChange())); } Qt4RunConfigurationWidget::~Qt4RunConfigurationWidget() @@ -363,8 +363,9 @@ void Qt4RunConfigurationWidget::userChangesEdited() m_ignoreChange = false; } -void Qt4RunConfigurationWidget::runConfigurationEnabledChange(bool enabled) +void Qt4RunConfigurationWidget::runConfigurationEnabledChange() { + bool enabled = m_qt4RunConfiguration->isEnabled(); m_detailsContainer->setEnabled(enabled); m_environmentWidget->setEnabled(enabled); m_disabledIcon->setVisible(!enabled); diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h index 4762b8edec174bb373e1d8d64dd41404fa70952d..062b013d4fd7525e55132451367ae4545ac5b73c 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h @@ -169,7 +169,7 @@ protected: void hideEvent(QHideEvent *event); private slots: - void runConfigurationEnabledChange(bool); + void runConfigurationEnabledChange(); void workDirectoryEdited(); void workingDirectoryReseted(); void argumentsEdited(const QString &arguments); diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp index 54bf0c2164f8851f5c7ba30bb2e18d768aa53732..ce74f2e8fa754132e42eff0f24fadbaa4dd7947e 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp @@ -113,7 +113,7 @@ void S60DeviceRunConfiguration::proFileUpdate(Qt4ProjectManager::Qt4ProFileNode m_validParse = success; m_parseInProgress = parseInProgress; if (enabled != isEnabled()) - emit isEnabledChanged(!enabled); + emit enabledChanged(); if (!parseInProgress) emit targetInformationChanged(); } diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp index f4034b906c7a882c7453b4dc6a8a540db01bffe4..bba25dbf5642e92129c6aad34de5291e3f0461b9 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp @@ -86,10 +86,10 @@ S60DeviceRunConfigurationWidget::S60DeviceRunConfigurationWidget( connect(m_argumentsLineEdit, SIGNAL(textEdited(QString)), this, SLOT(argumentsEdited(QString))); - connect(m_runConfiguration, SIGNAL(isEnabledChanged(bool)), - this, SLOT(runConfigurationEnabledChange(bool))); + connect(m_runConfiguration, SIGNAL(enabledChanged()), + this, SLOT(runConfigurationEnabledChange())); - runConfigurationEnabledChange(m_runConfiguration->isEnabled()); + runConfigurationEnabledChange(); } void S60DeviceRunConfigurationWidget::argumentsEdited(const QString &text) @@ -97,8 +97,9 @@ void S60DeviceRunConfigurationWidget::argumentsEdited(const QString &text) m_runConfiguration->setCommandLineArguments(text.trimmed()); } -void S60DeviceRunConfigurationWidget::runConfigurationEnabledChange(bool enabled) +void S60DeviceRunConfigurationWidget::runConfigurationEnabledChange() { + bool enabled = m_runConfiguration->isEnabled(); m_detailsWidget->setEnabled(enabled); m_disabledIcon->setVisible(!enabled); m_disabledReason->setVisible(!enabled); diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h index f5f69048a4673864a1ee33df232a49d6abd63626..7a1ab41879c29287e0eee18fbb21d5e05c3149fc 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h @@ -56,7 +56,7 @@ public: QWidget *parent = 0); private slots: void argumentsEdited(const QString &text); - void runConfigurationEnabledChange(bool enabled); + void runConfigurationEnabledChange(); private: S60DeviceRunConfiguration *m_runConfiguration; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp index 1a186a0d07300a6790ced07321af966ab525421e..1a1a2146a77beabafe284158d822c3c90ea29f67 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp @@ -116,7 +116,7 @@ void S60EmulatorRunConfiguration::proFileUpdate(Qt4ProjectManager::Qt4ProFileNod m_validParse = success; m_parseInProgress = parseInProgress; if (enabled != isEnabled()) { - emit isEnabledChanged(!enabled); + emit enabledChanged(); } if (parseInProgress) emit targetInformationChanged(); @@ -244,10 +244,10 @@ S60EmulatorRunConfigurationWidget::S60EmulatorRunConfigurationWidget(S60Emulator connect(m_runConfiguration, SIGNAL(targetInformationChanged()), this, SLOT(updateTargetInformation())); - connect(m_runConfiguration, SIGNAL(isEnabledChanged(bool)), - this, SLOT(runConfigurationEnabledChange(bool))); + connect(m_runConfiguration, SIGNAL(enabledChanged()), + this, SLOT(runConfigurationEnabledChange())); - runConfigurationEnabledChange(m_runConfiguration->isEnabled()); + runConfigurationEnabledChange(); } void S60EmulatorRunConfigurationWidget::updateTargetInformation() @@ -255,8 +255,9 @@ void S60EmulatorRunConfigurationWidget::updateTargetInformation() m_executableLabel->setText(m_runConfiguration->executable()); } -void S60EmulatorRunConfigurationWidget::runConfigurationEnabledChange(bool enabled) +void S60EmulatorRunConfigurationWidget::runConfigurationEnabledChange() { + bool enabled = m_runConfiguration->isEnabled(); m_detailsWidget->setEnabled(enabled); m_disabledIcon->setVisible(!enabled); m_disabledReason->setVisible(!enabled); diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h index 1ce10f83fde4a1c80a5db902bc5e27e1a6226040..be38f4c23812baf7eac78aa29fee629b1c70b821 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h @@ -108,7 +108,7 @@ public: private slots: void updateTargetInformation(); - void runConfigurationEnabledChange(bool enabled); + void runConfigurationEnabledChange(); private: S60EmulatorRunConfiguration *m_runConfiguration; diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.h b/src/plugins/remotelinux/remotelinuxrunconfiguration.h index 20bc9d676d7f189f5df67feb5969ad9f24eb8772..29b4656877739b16f5958244c6e53d3361f6d22d 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfiguration.h +++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.h @@ -134,7 +134,9 @@ protected: QString defaultDisplayName(); void setDisabledReason(const QString &reason) const; QString userEnvironmentChangesAsString() const; - Q_SLOT void updateEnabledState() { emit isEnabledChanged(isEnabled()); } + +protected slots: + void updateEnabledState() { emit enabledChanged(); } private slots: void proFileUpdate(Qt4ProjectManager::Qt4ProFileNode *pro, bool success, bool parseInProgress); diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp index 375d7004be9f6916276fa0040b6b6dd2fc4d69f5..bf30a70ff574d5acd8b56ebc03239779028e8da8 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp @@ -114,9 +114,9 @@ RemoteLinuxRunConfigurationWidget::RemoteLinuxRunConfigurationWidget(RemoteLinux connect(d->runConfiguration, SIGNAL(deviceConfigurationChanged(ProjectExplorer::Target*)), SLOT(handleCurrentDeviceConfigChanged())); handleCurrentDeviceConfigChanged(); - connect(d->runConfiguration, SIGNAL(isEnabledChanged(bool)), - SLOT(runConfigurationEnabledChange(bool))); - runConfigurationEnabledChange(d->runConfiguration->isEnabled()); + connect(d->runConfiguration, SIGNAL(enabledChanged()), + SLOT(runConfigurationEnabledChange())); + runConfigurationEnabledChange(); } RemoteLinuxRunConfigurationWidget::~RemoteLinuxRunConfigurationWidget() @@ -141,8 +141,9 @@ void RemoteLinuxRunConfigurationWidget::addDisabledLabel(QVBoxLayout *topLayout) topLayout->addLayout(hl); } -void RemoteLinuxRunConfigurationWidget::runConfigurationEnabledChange(bool enabled) +void RemoteLinuxRunConfigurationWidget::runConfigurationEnabledChange() { + bool enabled = d->runConfiguration->isEnabled(); d->topWidget.setEnabled(enabled); d->disabledIcon.setVisible(!enabled); d->disabledReason.setVisible(!enabled); diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h index 74c5a904204fdffd85a6579c96779da5bc59e030..840c3b54f1a8437724f817d036556cea334b34bd 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h @@ -60,7 +60,7 @@ public: void addFormLayoutRow(QWidget *label, QWidget *field); void addDisabledLabel(QVBoxLayout *topLayout); - Q_SLOT void runConfigurationEnabledChange(bool enabled); + Q_SLOT void runConfigurationEnabledChange(); private slots: void argumentsEdited(const QString &args);