gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-28 14:47:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

[SettingsManager] Properly handle multithreaded access (#6747)

Browse Source
This commit is contained in:
RickyRister
2026-03-27 17:12:49 +01:00
committed by GitHub
parent dd053c76df
commit 74cce5ccb2
3 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcockatrice_settings/libcockatrice/settings/settings_manager.cpp
+21 -3
View File
@@ -1,16 +1,22 @@
#include "settings_manager.h"
SettingsManager::SettingsManager(const QString &settingPath,
SettingsManager::SettingsManager(const QString &_settingPath,
const QString &_defaultGroup,
const QString &_defaultSubGroup,
QObject *parent)
: QObject(parent), settings(settingPath, QSettings::IniFormat), defaultGroup(_defaultGroup),
defaultSubGroup(_defaultSubGroup)
: 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)
{
auto settings = getSettings();
if (!defaultGroup.isEmpty()) {
settings.beginGroup(defaultGroup);
}
@@ -121,6 +135,8 @@ QVariant SettingsManager::getValue(const QString &name)
QVariant SettingsManager::getValue(const QString &name, const QString &group, const QString &subGroup)
{
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();
}
libcockatrice_settings/libcockatrice/settings/settings_manager.h
+4 -1
View File
@@ -24,9 +24,12 @@ public:
void sync();
protected:
QSettings settings;
QString settingPath;
QString defaultGroup;
QString defaultSubGroup;
QSettings getSettings() const;
void setValue(const QVariant &value, const QString &name);
void
setValue(const QVariant &value, const QString &name, const QString &group, const QString &subGroup = QString());