diff options
| author | Orgad Shaneh <orgads@gmail.com> | 2012-08-09 12:58:51 +0300 |
|---|---|---|
| committer | hjk <qthjk@ovi.com> | 2012-08-09 13:09:08 +0200 |
| commit | 99aa8007c17abdd1a89dffc82a29dbf7b46f190e (patch) | |
| tree | 195f7c5af77e3987c1b75f002b21a8ba35bd4b76 /src/plugins/texteditor/snippets/snippetssettingspage.cpp | |
| parent | 7ba9c60f5530a4289f7e544a25e53c6d89c73a3a (diff) | |
| download | qt-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/snippets/snippetssettingspage.cpp')
| -rw-r--r-- | src/plugins/texteditor/snippets/snippetssettingspage.cpp | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.cpp b/src/plugins/texteditor/snippets/snippetssettingspage.cpp index 41015a4af1..54d0bb82fb 100644 --- a/src/plugins/texteditor/snippets/snippetssettingspage.cpp +++ b/src/plugins/texteditor/snippets/snippetssettingspage.cpp @@ -419,15 +419,13 @@ void SnippetsSettingsPagePrivate::loadSettings() if (m_ui.groupCombo->count() == 0) return; - if (QSettings *s = Core::ICore::settings()) { - m_settings.fromSettings(m_settingsPrefix, s); - const QString &lastGroupName = m_settings.lastUsedSnippetGroup(); - const int index = m_ui.groupCombo->findText(lastGroupName); - if (index != -1) - m_ui.groupCombo->setCurrentIndex(index); - else - m_ui.groupCombo->setCurrentIndex(0); - } + m_settings.fromSettings(m_settingsPrefix, Core::ICore::settings()); + const QString &lastGroupName = m_settings.lastUsedSnippetGroup(); + const int index = m_ui.groupCombo->findText(lastGroupName); + if (index != -1) + m_ui.groupCombo->setCurrentIndex(index); + else + m_ui.groupCombo->setCurrentIndex(0); } void SnippetsSettingsPagePrivate::writeSettings() @@ -435,10 +433,8 @@ void SnippetsSettingsPagePrivate::writeSettings() if (m_ui.groupCombo->count() == 0) return; - if (QSettings *s = Core::ICore::settings()) { - m_settings.setLastUsedSnippetGroup(m_ui.groupCombo->currentText()); - m_settings.toSettings(m_settingsPrefix, s); - } + m_settings.setLastUsedSnippetGroup(m_ui.groupCombo->currentText()); + m_settings.toSettings(m_settingsPrefix, Core::ICore::settings()); } bool SnippetsSettingsPagePrivate::settingsChanged() const |