diff options
author | Eike Ziller <eike.ziller@digia.com> | 2013-05-30 13:48:27 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2013-05-30 13:48:27 +0200 |
commit | 0a95b28147d9c4ea57ba9b025beec2d503399acf (patch) | |
tree | 9032878c4c1b3877167990376d3871db70eb304c /src/plugins/find | |
parent | cca4cbfb02da327c844c1291d43a8f7f6420e334 (diff) | |
parent | 10d7d61e263573116965b1af53cdbda0f668211d (diff) | |
download | qt-creator-0a95b28147d9c4ea57ba9b025beec2d503399acf.tar.gz |
Merge remote-tracking branch 'origin/2.8'
Diffstat (limited to 'src/plugins/find')
-rw-r--r-- | src/plugins/find/searchresultwindow.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/plugins/find/searchresultwindow.cpp b/src/plugins/find/searchresultwindow.cpp index 61523af265..cda06a6464 100644 --- a/src/plugins/find/searchresultwindow.cpp +++ b/src/plugins/find/searchresultwindow.cpp @@ -508,11 +508,9 @@ void SearchResultWindow::handleExpandCollapseToolButton(bool checked) void SearchResultWindow::readSettings() { QSettings *s = Core::ICore::settings(); - if (s) { - s->beginGroup(QLatin1String(SETTINGSKEYSECTIONNAME)); - d->m_expandCollapseAction->setChecked(s->value(QLatin1String(SETTINGSKEYEXPANDRESULTS), d->m_initiallyExpand).toBool()); - s->endGroup(); - } + s->beginGroup(QLatin1String(SETTINGSKEYSECTIONNAME)); + d->m_expandCollapseAction->setChecked(s->value(QLatin1String(SETTINGSKEYEXPANDRESULTS), d->m_initiallyExpand).toBool()); + s->endGroup(); } /*! @@ -521,11 +519,9 @@ void SearchResultWindow::readSettings() void SearchResultWindow::writeSettings() { QSettings *s = Core::ICore::settings(); - if (s) { - s->beginGroup(QLatin1String(SETTINGSKEYSECTIONNAME)); - s->setValue(QLatin1String(SETTINGSKEYEXPANDRESULTS), d->m_expandCollapseAction->isChecked()); - s->endGroup(); - } + s->beginGroup(QLatin1String(SETTINGSKEYSECTIONNAME)); + s->setValue(QLatin1String(SETTINGSKEYEXPANDRESULTS), d->m_expandCollapseAction->isChecked()); + s->endGroup(); } /*! |