Commit 89f3c1c2 authored by Tobias Hunger's avatar Tobias Hunger

RunConfig: Rename signal isEnabledChanged(bool)

Rename signal isEnabledChanged(bool) to enabledChanged() as that is
also used by the BuildConfigurations.

Change-Id: I9fc8906a2abbf9d19e21129309bee6ff5a142117
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent 0ebd74d6
......@@ -316,7 +316,7 @@ void CMakeRunConfiguration::setEnabled(bool b)
if (m_enabled == b)
return;
m_enabled = b;
emit isEnabledChanged(isEnabled());
emit enabledChanged();
setDefaultDisplayName(defaultDisplayName());
}
......
......@@ -93,13 +93,14 @@ MaemoRunConfigurationWidget::MaemoRunConfigurationWidget(
= qobject_cast<AbstractQt4MaemoTarget *>(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);
}
......
......@@ -66,7 +66,7 @@ private slots:
void enableOrDisableRemoveMountSpecButton();
void handleRemoteMountsChanged();
void updateMountWarning();
void runConfigurationEnabledChange(bool enabled);
void runConfigurationEnabledChange();
private:
void addMountWidgets(QVBoxLayout *mainLayout);
......
......@@ -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()));
......
......@@ -178,7 +178,7 @@ public:
virtual ProjectExplorer::Abi abi() const;
signals:
void isEnabledChanged(bool value);
void enabledChanged();
protected:
RunConfiguration(Target *parent, const QString &id);
......
......@@ -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()
......
......@@ -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);
......
......@@ -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);
......
......@@ -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();
}
......
......@@ -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);
......
......@@ -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;
......
......@@ -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);
......
......@@ -108,7 +108,7 @@ public:
private slots:
void updateTargetInformation();
void runConfigurationEnabledChange(bool enabled);
void runConfigurationEnabledChange();
private:
S60EmulatorRunConfiguration *m_runConfiguration;
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment