jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-28 20:00:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[Settings] Split cache_settings monolith into multiple SettingsManager sub-classes (#7050)

Browse source 
* [Settings] Split cache_settings into multiple files

Took 9 minutes

Took 4 minutes

* [Settings] Fwd declare settings classes in cache_settings

Took 15 minutes

* Fix oracle includes.

Took 8 minutes

* Address comments, fix windows CI

Took 8 minutes

* fix copy constructor visibility

Took 3 minutes

* lint

Took 2 minutes

* Fix native format tests.

Took 5 minutes

* Remove test header guard

Took 4 seconds

* Remove tests invalid in CI environ

Took 24 seconds

* Adjust to rebase.

Took 11 minutes

* Change settings file name.

Took 8 minutes

---------

Co-authored-by: Lukas Brübach <lukas.bruebach@bdosecurity.de>
Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2026-07-27 11:25:39 +02:00 • committed by GitHub
parent cf0b453e75
commit 12f0f59453
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
166 changed files with 5589 additions and 3066 deletions
Download patch file Download diff file Expand all files Collapse all files

46
libcockatrice_settings/libcockatrice/settings/settings_manager.cpp
View file

@ -138,21 +138,55 @@ QVariant SettingsManager::getValue(const QString &name, const QString &group, co
{
auto settings = getSettings();
if (!group.isEmpty()) {
settings.beginGroup(group);
QString effectiveGroup = group.isEmpty() ? defaultGroup : group;
QString effectiveSubGroup = subGroup.isEmpty() ? defaultSubGroup : subGroup;
if (!effectiveGroup.isEmpty()) {
settings.beginGroup(effectiveGroup);
}
if (!subGroup.isEmpty()) {
settings.beginGroup(subGroup);
if (!effectiveSubGroup.isEmpty()) {
settings.beginGroup(effectiveSubGroup);
}
QVariant value = settings.value(name);
if (!subGroup.isEmpty()) {
if (!effectiveSubGroup.isEmpty()) {
settings.endGroup();
}
if (!group.isEmpty()) {
if (!effectiveGroup.isEmpty()) {
settings.endGroup();
}
return value;
}
QVariant SettingsManager::getValue(const QString &name,
const QString &group,
const QString &subGroup,
const QVariant &defaultValue) const
{
auto settings = getSettings();
QString effectiveGroup = group.isEmpty() ? defaultGroup : group;
QString effectiveSubGroup = subGroup.isEmpty() ? defaultSubGroup : subGroup;
if (!effectiveGroup.isEmpty()) {
settings.beginGroup(effectiveGroup);
}
if (!effectiveSubGroup.isEmpty()) {
settings.beginGroup(effectiveSubGroup);
}
QVariant value = settings.value(name, defaultValue);
if (!effectiveSubGroup.isEmpty()) {
settings.endGroup();
}
if (!effectiveGroup.isEmpty()) {
settings.endGroup();
}