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

ProjectExplorer: Rename TerminalAspect::m_isForced -> m_userSet

Browse Source 
Change-Id: I209abef3e6682b2d3725e0e58e0289cd5757c497
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
hjk
2015-05-12 12:29:09 +02:00
parent 89f100adf6
commit 98c0713a41
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/projectexplorer/runconfigurationaspects.cpp
View File

@@ -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);
}