Merge remote-tracking branch 'origin/2.8'

1 files changed, 4 insertions, 10 deletions

diff --git a/src/plugins/classview/classviewnavigationwidgetfactory.cpp b/src/plugins/classview/classviewnavigationwidgetfactory.cpp
index bc3664b9a5..b85a9213c6 100644
--- a/src/plugins/classview/classviewnavigationwidgetfactory.cpp
+++ b/src/plugins/classview/classviewnavigationwidgetfactory.cpp
@@ -123,14 +123,11 @@ void NavigationWidgetFactory::saveSettings(int position, QWidget *widget)
     NavigationWidget *pw = qobject_cast<NavigationWidget *>(widget);
     QTC_ASSERT(pw, return);
 
-    QSettings *settings = Core::ICore::settings();
-    QTC_ASSERT(settings, return);
-
     // .beginGroup is not used - to prevent simultaneous access
     QString group = settingsPrefix(position);
 
-    // save settings
-    settings->setValue(group, pw->flatMode());
+    // Save settings
+    Core::ICore::settings()->setValue(group, pw->flatMode());
 }
 
 void NavigationWidgetFactory::restoreSettings(int position, QWidget *widget)
@@ -138,14 +135,11 @@ void NavigationWidgetFactory::restoreSettings(int position, QWidget *widget)
     NavigationWidget *pw = qobject_cast<NavigationWidget *>(widget);
     QTC_ASSERT(pw, return);
 
-    QSettings *settings = Core::ICore::settings();
-    QTC_ASSERT(settings, return);
-
     // .beginGroup is not used - to prevent simultaneous access
     QString group = settingsPrefix(position);
 
-    // load settings
-    pw->setFlatMode(settings->value(group, false).toBool());
+    // Load settings
+    pw->setFlatMode(Core::ICore::settings()->value(group, false).toBool());
 }
 
 } // namespace Internal