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

Utils: Merge settingsutils.h into Store setup

Browse Source 
Change-Id: I4f87400d3ff50869798a363f0d15aa77af0edf5c
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2023-09-11 15:30:07 +02:00
parent 7268f036de
commit d6dba7dc9f
16 changed files with 47 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cppeditor/cppcodemodelsettings.cpp
View File

@@ -17,7 +17,6 @@
#include <utils/hostosinfo.h>
#include <utils/process.h>
#include <utils/qtcassert.h>
#include <utils/settingsutils.h>
#include <QDateTime>
#include <QHash>
@@ -400,7 +399,8 @@ FilePath ClangdSettings::clangdUserConfigFilePath()
void ClangdSettings::loadSettings()
{
const auto settings = Core::ICore::settings();
Utils::fromSettings(clangdSettingsKey(), {}, settings, &m_data);
m_data.fromMap(Utils::storeFromSettings(clangdSettingsKey(), settings));
settings->beginGroup(QLatin1String(Constants::CPPEDITOR_SETTINGSGROUP));
m_data.customDiagnosticConfigs = diagnosticConfigsFromSettings(settings);
@@ -419,7 +419,7 @@ void ClangdSettings::loadSettings()
void ClangdSettings::saveSettings()
{
const auto settings = Core::ICore::settings();
Utils::toSettings(clangdSettingsKey(), {}, settings, &m_data);
Utils::storeToSettings(clangdSettingsKey(), settings, m_data.toMap());
settings->beginGroup(QLatin1String(Constants::CPPEDITOR_SETTINGSGROUP));
diagnosticConfigsToSettings(settings, m_data.customDiagnosticConfigs);
settings->endGroup();