summaryrefslogtreecommitdiff
path: root/src/plugins/qmljstools
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2013-05-28 15:17:20 +0200
committerhjk <hjk121@nokiamail.com>2013-05-29 09:40:17 +0200
commit8390a321319f1fdf8c92ae40408ee6db02b75908 (patch)
tree775d71982425eac82b00aaeb493ba81481908582 /src/plugins/qmljstools
parent0b225af84c6377416959ae2174823c8f1e9e7073 (diff)
downloadqt-creator-8390a321319f1fdf8c92ae40408ee6db02b75908.tar.gz
Settings: Simplify some user code
This is still way too much boiler plate code for the task at hand. Change-Id: Ia03bff3d6947ea6372e3f5d0217c116728742b74 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/plugins/qmljstools')
-rw-r--r--src/plugins/qmljstools/qmljscodestylesettingspage.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
index baf3b523d8..bb1fbe755b 100644
--- a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
+++ b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
@@ -196,13 +196,11 @@ void QmlJSCodeStyleSettingsPage::apply()
TextEditor::SimpleCodeStylePreferences *originalTabPreferences = QmlJSToolsSettings::globalCodeStyle();
if (originalTabPreferences->tabSettings() != m_pageTabPreferences->tabSettings()) {
originalTabPreferences->setTabSettings(m_pageTabPreferences->tabSettings());
- if (s)
- originalTabPreferences->toSettings(QLatin1String(QmlJSTools::Constants::QML_JS_SETTINGS_ID), s);
+ originalTabPreferences->toSettings(QLatin1String(QmlJSTools::Constants::QML_JS_SETTINGS_ID), s);
}
if (originalTabPreferences->currentDelegate() != m_pageTabPreferences->currentDelegate()) {
originalTabPreferences->setCurrentDelegate(m_pageTabPreferences->currentDelegate());
- if (s)
- originalTabPreferences->toSettings(QLatin1String(QmlJSTools::Constants::QML_JS_SETTINGS_ID), s);
+ originalTabPreferences->toSettings(QLatin1String(QmlJSTools::Constants::QML_JS_SETTINGS_ID), s);
}
}
}