From 5d67ad37cf2bb39644f803fe7d97f2bf8e77cd4d Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 18 Jul 2023 14:14:18 +0200
Subject: [PATCH] Debugger: Simplify code path leading to .writeSettings()

Change-Id: Iaea1159305507e10adf2b448a774e2b528eaef80
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/debugger/debuggeractions.cpp |  8 ++++----
 src/plugins/debugger/debuggeractions.h   |  2 --
 src/plugins/debugger/debuggerplugin.cpp  | 10 ----------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index ecfcf0e5b5a..074197eec1a 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -10,6 +10,7 @@
 #include "gdb/gdbsettings.h"
 
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/icore.h>
 
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
@@ -370,11 +371,10 @@ DebuggerSettings::DebuggerSettings() :
     });
 
     all.readSettings();
-}
 
-void DebuggerSettings::writeSettings() const
-{
-    all.writeSettings();
+    QObject::connect(Core::ICore::instance(), &Core::ICore::saveSettingsRequested,
+                     &all, &AspectContainer::writeSettings);
+
 }
 
 QString DebuggerSettings::dump()
diff --git a/src/plugins/debugger/debuggeractions.h b/src/plugins/debugger/debuggeractions.h
index 8fa62d172db..f455aba7a74 100644
--- a/src/plugins/debugger/debuggeractions.h
+++ b/src/plugins/debugger/debuggeractions.h
@@ -124,8 +124,6 @@ public:
     Utils::AspectContainer page5; // CDB
     Utils::AspectContainer page6; // CDB Paths
 
-    void writeSettings() const;
-
 private:
     DebuggerSettings(const DebuggerSettings &) = delete;
     DebuggerSettings &operator=(const DebuggerSettings &) = delete;
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 3add78b59ff..18d68ac2bb9 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -583,12 +583,6 @@ public:
 
     RunControl *attachToRunningProcess(Kit *kit, const ProcessInfo &process, bool contAfterAttach);
 
-    void writeSettings()
-    {
-        settings().writeSettings();
-//        writeWindowSettings();
-    }
-
     void breakpointSetMarginActionTriggered(bool isMessageOnly, const ContextData &data)
     {
         QString message;
@@ -1160,10 +1154,6 @@ DebuggerPluginPrivate::DebuggerPluginPrivate(const QStringList &arguments)
     //  Connections
     //
 
-    // Core
-    connect(ICore::instance(), &ICore::saveSettingsRequested,
-            this, &DebuggerPluginPrivate::writeSettings);
-
     // ProjectExplorer
     connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::runActionsUpdated,
             this, &DebuggerPluginPrivate::updatePresetState);