summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer
diff options
context:
space:
mode:
authorhjk <hjk@theqtcompany.com>2015-05-12 12:29:09 +0200
committerhjk <hjk@theqtcompany.com>2015-05-12 10:37:28 +0000
commit98c0713a41ee7d5d84b40c4405d17880aa390f4c (patch)
tree2159f7ad9d03057c91077e35a215a86b7cdc2c13 /src/plugins/projectexplorer
parent89f100adf6831ab8dd4d1c4605cd7583e09f232c (diff)
downloadqt-creator-98c0713a41ee7d5d84b40c4405d17880aa390f4c.tar.gz
ProjectExplorer: Rename TerminalAspect::m_isForced -> m_userSet
Change-Id: I209abef3e6682b2d3725e0e58e0289cd5757c497 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Diffstat (limited to 'src/plugins/projectexplorer')
-rw-r--r--src/plugins/projectexplorer/runconfigurationaspects.cpp14
-rw-r--r--src/plugins/projectexplorer/runconfigurationaspects.h4
2 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp
index 7d7d05678c..b9977dcc2b 100644
--- a/src/plugins/projectexplorer/runconfigurationaspects.cpp
+++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp
@@ -54,9 +54,9 @@ namespace ProjectExplorer {
\class ProjectExplorer::TerminalAspect
*/
-TerminalAspect::TerminalAspect(RunConfiguration *runConfig, const QString &key, bool useTerminal, bool isForced)
+TerminalAspect::TerminalAspect(RunConfiguration *runConfig, const QString &key, bool useTerminal, bool userSet)
: IRunConfigurationAspect(runConfig), m_useTerminal(useTerminal),
- m_isForced(isForced), m_checkBox(0), m_key(key)
+ m_userSet(userSet), m_checkBox(0), m_key(key)
{
setDisplayName(tr("Terminal"));
setId("TerminalAspect");
@@ -69,7 +69,7 @@ IRunConfigurationAspect *TerminalAspect::create(RunConfiguration *runConfig) con
IRunConfigurationAspect *TerminalAspect::clone(RunConfiguration *runConfig) const
{
- return new TerminalAspect(runConfig, m_key, m_useTerminal, m_isForced);
+ return new TerminalAspect(runConfig, m_key, m_useTerminal, m_userSet);
}
void TerminalAspect::addToMainConfigurationWidget(QWidget *parent, QFormLayout *layout)
@@ -79,7 +79,7 @@ void TerminalAspect::addToMainConfigurationWidget(QWidget *parent, QFormLayout *
m_checkBox->setChecked(m_useTerminal);
layout->addRow(QString(), m_checkBox);
connect(m_checkBox.data(), &QAbstractButton::clicked, this, [this] {
- m_isForced = true;
+ m_userSet = true;
setUseTerminal(true);
});
}
@@ -88,15 +88,15 @@ void TerminalAspect::fromMap(const QVariantMap &map)
{
if (map.contains(m_key)) {
m_useTerminal = map.value(m_key).toBool();
- m_isForced = true;
+ m_userSet = true;
} else {
- m_isForced = false;
+ m_userSet = false;
}
}
void TerminalAspect::toMap(QVariantMap &data) const
{
- if (m_isForced)
+ if (m_userSet)
data.insert(m_key, m_useTerminal);
}
diff --git a/src/plugins/projectexplorer/runconfigurationaspects.h b/src/plugins/projectexplorer/runconfigurationaspects.h
index 6b25110470..ee631ae2ca 100644
--- a/src/plugins/projectexplorer/runconfigurationaspects.h
+++ b/src/plugins/projectexplorer/runconfigurationaspects.h
@@ -51,7 +51,7 @@ class PROJECTEXPLORER_EXPORT TerminalAspect : public IRunConfigurationAspect
Q_OBJECT
public:
- explicit TerminalAspect(RunConfiguration *rc, const QString &key, bool useTerminal = false, bool isForced = false);
+ explicit TerminalAspect(RunConfiguration *rc, const QString &key, bool useTerminal = false, bool userSet = false);
IRunConfigurationAspect *create(RunConfiguration *runConfig) const override;
IRunConfigurationAspect *clone(RunConfiguration *runConfig) const override;
@@ -69,7 +69,7 @@ private:
void toMap(QVariantMap &map) const override;
bool m_useTerminal;
- bool m_isForced;
+ bool m_userSet;
QPointer<QCheckBox> m_checkBox; // Owned by RunConfigWidget
QString m_key;
};