summaryrefslogtreecommitdiff
path: root/src/plugins/texteditor/displaysettingspage.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgads@gmail.com>2012-08-09 12:58:51 +0300
committerhjk <qthjk@ovi.com>2012-08-09 13:09:08 +0200
commit99aa8007c17abdd1a89dffc82a29dbf7b46f190e (patch)
tree195f7c5af77e3987c1b75f002b21a8ba35bd4b76 /src/plugins/texteditor/displaysettingspage.cpp
parent7ba9c60f5530a4289f7e544a25e53c6d89c73a3a (diff)
downloadqt-creator-99aa8007c17abdd1a89dffc82a29dbf7b46f190e.tar.gz
Remove NULL tests for Core::ICore::settings()
It cannot really be NULL Change-Id: I7231e00754464347dc5750249f751cda7f831930 Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/plugins/texteditor/displaysettingspage.cpp')
-rw-r--r--src/plugins/texteditor/displaysettingspage.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/texteditor/displaysettingspage.cpp b/src/plugins/texteditor/displaysettingspage.cpp
index 99249edd7a..12215fecf8 100644
--- a/src/plugins/texteditor/displaysettingspage.cpp
+++ b/src/plugins/texteditor/displaysettingspage.cpp
@@ -53,9 +53,7 @@ DisplaySettingsPage::DisplaySettingsPagePrivate::DisplaySettingsPagePrivate
(const DisplaySettingsPageParameters &p)
: m_parameters(p), m_page(0)
{
- if (const QSettings *s = Core::ICore::settings()) {
- m_displaySettings.fromSettings(m_parameters.settingsPrefix, s);
- }
+ m_displaySettings.fromSettings(m_parameters.settingsPrefix, Core::ICore::settings());
}
DisplaySettingsPage::DisplaySettingsPage(const DisplaySettingsPageParameters &p,
@@ -153,8 +151,7 @@ void DisplaySettingsPage::setDisplaySettings(const DisplaySettings &newDisplaySe
{
if (newDisplaySettings != d->m_displaySettings) {
d->m_displaySettings = newDisplaySettings;
- if (QSettings *s = Core::ICore::settings())
- d->m_displaySettings.toSettings(d->m_parameters.settingsPrefix, s);
+ d->m_displaySettings.toSettings(d->m_parameters.settingsPrefix, Core::ICore::settings());
emit displaySettingsChanged(newDisplaySettings);
}