Valgrind: Fix valgrind settings persistence

Change-Id: Idcd551e10d36cbadb8785bd7922777a45a871518
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

src/plugins/valgrind/memchecktool.cpp

@@ -927,9 +927,11 @@ void MemcheckToolPrivate::updateFromSettings()
     m_filterProjectAction->setChecked(!m_settings->filterExternalIssues());
     m_errorView->settingsChanged(m_settings);
 
+    m_errorProxyModel.setAcceptedKinds(m_settings->visibleErrorKinds());
     connect(&m_settings->visibleErrorKinds, &BaseAspect::changed, &m_errorProxyModel, [this] {
         m_errorProxyModel.setAcceptedKinds(m_settings->visibleErrorKinds());
     });
+    m_errorProxyModel.setFilterExternalIssues(m_settings->filterExternalIssues());
     connect(&m_settings->filterExternalIssues, &BaseAspect::changed, &m_errorProxyModel, [this] {
         m_errorProxyModel.setFilterExternalIssues(m_settings->filterExternalIssues());
     });
@@ -1109,6 +1111,7 @@ void MemcheckToolPrivate::updateErrorFilter()
         }
     }
     m_settings->visibleErrorKinds.setValue(errorKinds);
+    m_settings->visibleErrorKinds.writeToSettingsImmediatly();
 }
 
 int MemcheckToolPrivate::updateUiAfterFinishedHelper()

src/plugins/valgrind/valgrindsettings.cpp

@@ -416,6 +416,7 @@ ValgrindGlobalSettings::ValgrindGlobalSettings()
 
     setConfigWidgetCreator([this] { return createSettingsWidget(this); });
 
+    setSettingsGroup("Analyzer");
     readSettings();
     setAutoApply(false);
 }
@@ -424,44 +425,6 @@ ValgrindGlobalSettings::ValgrindGlobalSettings()
 // Memcheck
 //
 
-QVariantMap ValgrindBaseSettings::defaultSettings() const
-{
-    QVariantMap defaults;
-    forEachAspect([&defaults](BaseAspect *aspect) {
-        defaults.insert(aspect->settingsKey(), aspect->defaultVariantValue());
-    });
-    return defaults;
-}
-
-static const char groupC[] = "Analyzer";
-
-void ValgrindGlobalSettings::readSettings()
-{
-    // Read stored values
-    QSettings *settings = Core::ICore::settings();
-    settings->beginGroup(groupC);
-    QVariantMap map;
-    const QStringList childKey = settings->childKeys();
-    for (const QString &key : childKey)
-        map.insert(key, settings->value(key));
-    settings->endGroup();
-
-    fromMap(map);
-}
-
-void ValgrindGlobalSettings::writeSettings() const
-{
-    const QVariantMap defaults = defaultSettings();
-
-    Utils::QtcSettings *settings = Core::ICore::settings();
-    settings->beginGroup(groupC);
-    QVariantMap map;
-    toMap(map);
-    for (QVariantMap::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it)
-        settings->setValueWithDefault(it.key(), it.value(), defaults.value(it.key()));
-    settings->endGroup();
-}
-
 //////////////////////////////////////////////////////////////////
 //
 // ValgrindProjectSettings

src/plugins/valgrind/valgrindsettings.h

@@ -96,8 +96,6 @@ public:
     Utils::BoolAspect enableEventToolTips{this};
     Utils::DoubleAspect minimumInclusiveCostRatio{this};
     Utils::DoubleAspect visualizationMinimumInclusiveCostRatio{this};
-
-    QVariantMap defaultSettings() const;
 };
 
 /**
@@ -114,9 +112,6 @@ public:
      * Global memcheck settings
      */
 
-    void writeSettings() const;
-    void readSettings();
-
     Utils::FilePathAspect lastSuppressionDirectory{this};
     Utils::StringAspect lastSuppressionHistory{this};