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

CppEditor: Fix restoring per-project cpp file name settings

Browse Source 
Another victim of Utils::Store.
Also add missing initialization of "is global" state.

Change-Id: I3d20e1403795366044d3b2df552f2a5947ba8c98
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2024-01-23 17:05:49 +01:00
parent 7b04bdf491
commit 6d7387f1aa
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cppeditor/cppfilesettingspage.cpp
View File

@@ -489,7 +489,7 @@ void CppFileSettingsForProject::loadSettings()
if (!entry.isValid()) if (!entry.isValid())
return; return;
const QVariantMap data = entry.toMap(); const QVariantMap data = mapEntryFromStoreEntry(entry).toMap();
m_useGlobalSettings = data.value(useGlobalKeyC, true).toBool(); m_useGlobalSettings = data.value(useGlobalKeyC, true).toBool();
m_customSettings.headerPrefixes = data.value(headerPrefixesKeyC, m_customSettings.headerPrefixes = data.value(headerPrefixesKeyC,
m_customSettings.headerPrefixes).toStringList(); m_customSettings.headerPrefixes).toStringList();
@@ -553,6 +553,8 @@ CppFileSettingsForProjectWidget::CppFileSettingsForProjectWidget(
const CppFileSettingsForProject &settings) : d(new Private(settings)) const CppFileSettingsForProject &settings) : d(new Private(settings))
{ {
setGlobalSettingsId(Constants::CPP_FILE_SETTINGS_ID); setGlobalSettingsId(Constants::CPP_FILE_SETTINGS_ID);
setUseGlobalSettings(settings.useGlobalSettings());
const auto layout = new QVBoxLayout(this); const auto layout = new QVBoxLayout(this);
layout->setContentsMargins(0, 0, 0, 0); layout->setContentsMargins(0, 0, 0, 0);
layout->addWidget(&d->widget); layout->addWidget(&d->widget);