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

Remove NULL tests for Core::ICore::settings()

Browse Source 
It cannot really be NULL

Change-Id: I7231e00754464347dc5750249f751cda7f831930
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Orgad Shaneh
2012-08-09 12:58:51 +03:00
committed by hjk
parent 7ba9c60f55
commit 99aa8007c1
15 changed files with 153 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/texteditor/displaysettingspage.cpp
View File

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