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

[SettingsManager] Properly handle multithreaded access again

Browse source
This commit is contained in:
RickyRister 2026-05-04 22:13:32 -07:00
parent 7c9fbe2be0
commit 97ff9f049f
3 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,13 +4,19 @@ SettingsManager::SettingsManager(const QString &_settingPath,
const QString &_defaultGroup,
const QString &_defaultSubGroup,
QObject *parent)
: QObject(parent), defaultGroup(_defaultGroup), defaultSubGroup(_defaultSubGroup),
settings(_settingPath, QSettings::IniFormat)
: QObject(parent), settingPath(_settingPath), defaultGroup(_defaultGroup), defaultSubGroup(_defaultSubGroup)
{
}
QSettings SettingsManager::getSettings() const
{
return QSettings(settingPath, QSettings::IniFormat);
}
void SettingsManager::setValue(const QVariant &value, const QString &name)
{
auto settings = getSettings();
if (!defaultGroup.isEmpty()) {
settings.beginGroup(defaultGroup);
}
@ -35,6 +41,8 @@ void SettingsManager::setValue(const QVariant &value,
const QString &group,
const QString &subGroup)
{
auto settings = getSettings();
if (!group.isEmpty()) {
settings.beginGroup(group);
}
@ -56,6 +64,8 @@ void SettingsManager::setValue(const QVariant &value,
void SettingsManager::deleteValue(const QString &name)
{
auto settings = getSettings();
if (!defaultGroup.isEmpty()) {
settings.beginGroup(defaultGroup);
}
@ -77,6 +87,8 @@ void SettingsManager::deleteValue(const QString &name)
void SettingsManager::deleteValue(const QString &name, const QString &group, const QString &subGroup)
{
auto settings = getSettings();
if (!group.isEmpty()) {
settings.beginGroup(group);
}
@ -98,6 +110,8 @@ void SettingsManager::deleteValue(const QString &name, const QString &group, con
QVariant SettingsManager::getValue(const QString &name) const
{
auto settings = getSettings();
if (!defaultGroup.isEmpty()) {
settings.beginGroup(defaultGroup);
}
@ -121,6 +135,8 @@ QVariant SettingsManager::getValue(const QString &name) const
QVariant SettingsManager::getValue(const QString &name, const QString &group, const QString &subGroup) const
{
auto settings = getSettings();
if (!group.isEmpty()) {
settings.beginGroup(group);
}
@ -147,5 +163,7 @@ QVariant SettingsManager::getValue(const QString &name, const QString &group, co
*/
void SettingsManager::sync()
{
auto settings = getSettings();
settings.sync();
}

3
libcockatrice_settings/libcockatrice/settings/settings_manager.h
View file

@ -27,10 +27,11 @@ public:
void sync();
protected:
QString settingPath;
QString defaultGroup;
QString defaultSubGroup;
mutable QSettings settings;
QSettings getSettings() const;
void setValue(const QVariant &value, const QString &name);