From ece7ae6bb584ec3478a5dff4f814d6a206cc1747 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 18 Jul 2023 14:02:24 +0200 Subject: [PATCH] Debugger: Avoid now unusual external trigger of readSettings() Change-Id: I5a3c9f07e7b07184916b5ca3b95a8966c62193eb Reviewed-by: Christian Stenger --- src/plugins/debugger/commonoptionspage.cpp | 2 ++ src/plugins/debugger/debuggeractions.cpp | 3 --- src/plugins/debugger/debuggeractions.h | 1 - src/plugins/debugger/debuggerplugin.cpp | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/plugins/debugger/commonoptionspage.cpp b/src/plugins/debugger/commonoptionspage.cpp index d21aab57c91..a5e3246f0e7 100644 --- a/src/plugins/debugger/commonoptionspage.cpp +++ b/src/plugins/debugger/commonoptionspage.cpp @@ -127,6 +127,8 @@ CommonSettings::CommonSettings() "does not provide reliable information as it does not use scope " "information, it is switched off by default.")); useToolTipsInMainEditor.setDefaultValue(true); + + readSettings(); } CommonSettings::~CommonSettings() diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp index e1b4c57fb4d..ecfcf0e5b5a 100644 --- a/src/plugins/debugger/debuggeractions.cpp +++ b/src/plugins/debugger/debuggeractions.cpp @@ -368,10 +368,7 @@ DebuggerSettings::DebuggerSettings() : if (auto boolAspect = dynamic_cast(aspect)) boolAspect->setLabelPlacement(BoolAspect::LabelPlacement::AtCheckBox); }); -} -void DebuggerSettings::readSettings() -{ all.readSettings(); } diff --git a/src/plugins/debugger/debuggeractions.h b/src/plugins/debugger/debuggeractions.h index 9ea285388ae..8fa62d172db 100644 --- a/src/plugins/debugger/debuggeractions.h +++ b/src/plugins/debugger/debuggeractions.h @@ -124,7 +124,6 @@ public: Utils::AspectContainer page5; // CDB Utils::AspectContainer page6; // CDB Paths - void readSettings(); void writeSettings() const; private: diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 63ab6b95d41..3add78b59ff 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -771,8 +771,6 @@ DebuggerPluginPrivate::DebuggerPluginPrivate(const QStringList &arguments) Tr::tr("Debugger Runtime"), Tr::tr("Issues with starting the debugger.")}); - settings().readSettings(); - const auto addLabel = [](QWidget *widget, const QString &text) { auto vbox = qobject_cast(widget->layout()); QTC_ASSERT(vbox, return);