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

Debugger: Adapt to latest settings access style

Browse Source 
Change-Id: I14f737612b4fe6a37e650190b587ef0b04e559ea
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2023-07-13 15:23:29 +02:00
parent 9b2075e7ea
commit a5e773aeee
25 changed files with 202 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,18 +33,14 @@ const char cdbSettingsGroupC[] = "CDB2";
//
//////////////////////////////////////////////////////////////////////////
static DebuggerSettings *theDebuggerSettings_ = nullptr;
DebuggerSettings *debuggerSettings()
DebuggerSettings &settings()
{
QTC_CHECK(theDebuggerSettings_);
return theDebuggerSettings_;
static DebuggerSettings settings;
return settings;
}
DebuggerSettings::DebuggerSettings()
{
theDebuggerSettings_ = this;
const QString debugModeGroup(debugModeSettingsGroupC);
const QString cdbSettingsGroup(cdbSettingsGroupC);
@@ -482,8 +478,8 @@ void DebuggerSettings::writeSettings() const
QString DebuggerSettings::dump()
{
QStringList settings;
debuggerSettings()->all.forEachAspect([&settings](BaseAspect *aspect) {
QStringList msg;
settings().all.forEachAspect([&msg](BaseAspect *aspect) {
QString key = aspect->settingsKey();
if (!key.isEmpty()) {
const int pos = key.indexOf('/');
@@ -494,11 +490,11 @@ QString DebuggerSettings::dump()
QString setting = key + ": " + current + " (default: " + default_ + ')';
if (current != default_)
setting += " ***";
settings << setting;
msg << setting;
}
});
settings.sort();
return "Debugger settings:\n" + settings.join('\n');
msg.sort();
return "Debugger settings:\n" + msg.join('\n');
}
} // Debugger::Internal