feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Simplify code path leading to .writeSettings()

Browse Source 
Change-Id: Iaea1159305507e10adf2b448a774e2b528eaef80
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2023-07-18 14:14:18 +02:00
parent 1c4f973365
commit 5d67ad37cf
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/debuggeractions.cpp
View File

@@ -10,6 +10,7 @@
#include "gdb/gdbsettings.h" #include "gdb/gdbsettings.h"
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
@@ -370,11 +371,10 @@ DebuggerSettings::DebuggerSettings() :
}); });
all.readSettings(); all.readSettings();
}
void DebuggerSettings::writeSettings() const QObject::connect(Core::ICore::instance(), &Core::ICore::saveSettingsRequested,
{ &all, &AspectContainer::writeSettings);
all.writeSettings();
} }
QString DebuggerSettings::dump() QString DebuggerSettings::dump()

2
src/plugins/debugger/debuggeractions.h
View File

@@ -124,8 +124,6 @@ public:
Utils::AspectContainer page5; // CDB Utils::AspectContainer page5; // CDB
Utils::AspectContainer page6; // CDB Paths Utils::AspectContainer page6; // CDB Paths
void writeSettings() const;
private: private:
DebuggerSettings(const DebuggerSettings &) = delete; DebuggerSettings(const DebuggerSettings &) = delete;
DebuggerSettings &operator=(const DebuggerSettings &) = delete; DebuggerSettings &operator=(const DebuggerSettings &) = delete;

10
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -583,12 +583,6 @@ public:
RunControl *attachToRunningProcess(Kit *kit, const ProcessInfo &process, bool contAfterAttach); RunControl *attachToRunningProcess(Kit *kit, const ProcessInfo &process, bool contAfterAttach);
void writeSettings()
{
settings().writeSettings();
// writeWindowSettings();
}
void breakpointSetMarginActionTriggered(bool isMessageOnly, const ContextData &data) void breakpointSetMarginActionTriggered(bool isMessageOnly, const ContextData &data)
{ {
QString message; QString message;
@@ -1160,10 +1154,6 @@ DebuggerPluginPrivate::DebuggerPluginPrivate(const QStringList &arguments)
// Connections // Connections
// //
// Core
connect(ICore::instance(), &ICore::saveSettingsRequested,
this, &DebuggerPluginPrivate::writeSettings);
// ProjectExplorer // ProjectExplorer
connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::runActionsUpdated, connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::runActionsUpdated,
this, &DebuggerPluginPrivate::updatePresetState); this, &DebuggerPluginPrivate::updatePresetState);