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

6
src/plugins/texteditor/texteditorsettings.cpp
View File

@@ -229,8 +229,7 @@ TextEditorSettings::TextEditorSettings(QObject *parent)
this, SIGNAL(displaySettingsChanged(TextEditor::DisplaySettings)));
// TODO: Move these settings to TextEditor category
if (QSettings *s = Core::ICore::settings())
m_d->m_completionSettings.fromSettings(QLatin1String("CppTools/"), s);
m_d->m_completionSettings.fromSettings(QLatin1String("CppTools/"), Core::ICore::settings());
}
TextEditorSettings::~TextEditorSettings()
@@ -336,8 +335,7 @@ void TextEditorSettings::setCompletionSettings(const TextEditor::CompletionSetti
return;
m_d->m_completionSettings = settings;
if (QSettings *s = Core::ICore::settings())
m_d->m_completionSettings.toSettings(QLatin1String("CppTools/"), s);
m_d->m_completionSettings.toSettings(QLatin1String("CppTools/"), Core::ICore::settings());
emit completionSettingsChanged(m_d->m_completionSettings);
}