dahjah/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2025-12-16 12:08:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

clean up writeglobalsetting and readglobalsetting for less repeated code

Browse Source
This commit is contained in:
David Griswold 2025-10-06 15:38:05 +03:00 committed by OpenSauce
parent 934417d22d
commit 2046112a67
2 changed files with 15 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/citra_qt/configuration/config.cpp
View File

@ -141,7 +141,8 @@ void QtConfig::ReadBasicSetting(Settings::Setting<std::vector<Type>, ranged>& se
const std::vector<Type> default_value = setting.GetDefault(); const std::vector<Type> default_value = setting.GetDefault();
QStringList stringList = qt_config->value(name).toStringList(); QStringList stringList = qt_config->value(name).toStringList();
if (qt_config->value(name + QStringLiteral("/default"), false).toBool() || stringList.size() < 1) { if (qt_config->value(name + QStringLiteral("/default"), false).toBool() ||
stringList.size() < 1) {
setting.SetValue(default_value); setting.SetValue(default_value);
} else { } else {
if (stringList.size() < 1) { if (stringList.size() < 1) {
@ -188,27 +189,7 @@ void QtConfig::ReadGlobalSetting(Settings::SwitchableSetting<Type, ranged>& sett
const bool use_global = qt_config->value(name + QStringLiteral("/use_global"), true).toBool(); const bool use_global = qt_config->value(name + QStringLiteral("/use_global"), true).toBool();
setting.SetGlobal(use_global); setting.SetGlobal(use_global);
if (global || !use_global) { if (global || !use_global) {
QVariant default_value{}; ReadBasicSetting(setting);
if constexpr (std::is_enum_v<Type>) {
using TypeU = std::underlying_type_t<Type>;
default_value = QVariant::fromValue<TypeU>(static_cast<TypeU>(setting.GetDefault()));
setting.SetValue(static_cast<Type>(ReadSetting(name, default_value).value<TypeU>()));
} else {
default_value = QVariant::fromValue<Type>(setting.GetDefault());
setting.SetValue(ReadSetting(name, default_value).value<Type>());
}
}
}
template <>
void QtConfig::ReadGlobalSetting(Settings::SwitchableSetting<std::string>& setting) {
QString name = QString::fromStdString(setting.GetLabel());
const bool use_global = qt_config->value(name + QStringLiteral("/use_global"), true).toBool();
setting.SetGlobal(use_global);
if (global || !use_global) {
const QString default_value = QString::fromStdString(setting.GetDefault());
setting.SetValue(
ReadSetting(name, QVariant::fromValue(default_value)).toString().toStdString());
} }
} }
@ -217,7 +198,8 @@ template <>
void QtConfig::WriteBasicSetting(const Settings::Setting<std::string>& setting) { void QtConfig::WriteBasicSetting(const Settings::Setting<std::string>& setting) {
const QString name = QString::fromStdString(setting.GetLabel()); const QString name = QString::fromStdString(setting.GetLabel());
const std::string& value = setting.GetValue(); const std::string& value = setting.GetValue();
qt_config->setValue(name + QStringLiteral("/default"), value == setting.GetDefault()); if (global)
qt_config->setValue(name + QStringLiteral("/default"), value == setting.GetDefault());
qt_config->setValue(name, QString::fromStdString(value)); qt_config->setValue(name, QString::fromStdString(value));
} }
@ -226,7 +208,8 @@ void QtConfig::WriteBasicSetting(const Settings::Setting<std::vector<Type>, rang
const QString name = QString::fromStdString(setting.GetLabel()); const QString name = QString::fromStdString(setting.GetLabel());
const std::vector<Type>& value = setting.GetValue(); const std::vector<Type>& value = setting.GetValue();
qt_config->setValue(name + QStringLiteral("/default"), value == setting.GetDefault()); if (global)
qt_config->setValue(name + QStringLiteral("/default"), value == setting.GetDefault());
QStringList stringList; QStringList stringList;
if constexpr (std::is_enum_v<Type>) { if constexpr (std::is_enum_v<Type>) {
@ -241,15 +224,14 @@ void QtConfig::WriteBasicSetting(const Settings::Setting<std::vector<Type>, rang
stringList.append(QString::number(item)); stringList.append(QString::number(item));
} }
} }
qt_config->setValue(name, stringList);
} }
// Explicit u16 definition: Qt would store it as QMetaType otherwise, which is not human-readable // Explicit u16 definition: Qt would store it as QMetaType otherwise, which is not human-readable
template <> template <>
void QtConfig::WriteBasicSetting(const Settings::Setting<u16>& setting) { void QtConfig::WriteBasicSetting(const Settings::Setting<u16>& setting) {
const QString name = QString::fromStdString(setting.GetLabel()); const QString name = QString::fromStdString(setting.GetLabel());
const u16& value = setting.GetValue(); const u16& value = setting.GetValue();
qt_config->setValue(name + QStringLiteral("/default"), value == setting.GetDefault()); if (global)
qt_config->setValue(name + QStringLiteral("/default"), value == setting.GetDefault());
qt_config->setValue(name, static_cast<u32>(value)); qt_config->setValue(name, static_cast<u32>(value));
} }
@ -257,7 +239,8 @@ template <typename Type, bool ranged>
void QtConfig::WriteBasicSetting(const Settings::Setting<Type, ranged>& setting) { void QtConfig::WriteBasicSetting(const Settings::Setting<Type, ranged>& setting) {
const QString name = QString::fromStdString(setting.GetLabel()); const QString name = QString::fromStdString(setting.GetLabel());
const Type value = setting.GetValue(); const Type value = setting.GetValue();
qt_config->setValue(name + QStringLiteral("/default"), value == setting.GetDefault()); if (global)
qt_config->setValue(name + QStringLiteral("/default"), value == setting.GetDefault());
if constexpr (std::is_enum_v<Type>) { if constexpr (std::is_enum_v<Type>) {
qt_config->setValue(name, static_cast<std::underlying_type_t<Type>>(value)); qt_config->setValue(name, static_cast<std::underlying_type_t<Type>>(value));
} else { } else {
@ -273,39 +256,7 @@ void QtConfig::WriteGlobalSetting(const Settings::SwitchableSetting<Type, ranged
qt_config->setValue(name + QStringLiteral("/use_global"), setting.UsingGlobal()); qt_config->setValue(name + QStringLiteral("/use_global"), setting.UsingGlobal());
} }
if (global || !setting.UsingGlobal()) { if (global || !setting.UsingGlobal()) {
qt_config->setValue(name + QStringLiteral("/default"), value == setting.GetDefault()); WriteBasicSetting(setting);
if constexpr (std::is_enum_v<Type>) {
qt_config->setValue(name, static_cast<std::underlying_type_t<Type>>(value));
} else {
qt_config->setValue(name, QVariant::fromValue(value));
}
}
}
template <>
void QtConfig::WriteGlobalSetting(const Settings::SwitchableSetting<std::string>& setting) {
const QString name = QString::fromStdString(setting.GetLabel());
const std::string& value = setting.GetValue(global);
if (!global) {
qt_config->setValue(name + QStringLiteral("/use_global"), setting.UsingGlobal());
}
if (global || !setting.UsingGlobal()) {
qt_config->setValue(name + QStringLiteral("/default"), value == setting.GetDefault());
qt_config->setValue(name, QString::fromStdString(value));
}
}
// Explicit u16 definition: Qt would store it as QMetaType otherwise, which is not human-readable
template <>
void QtConfig::WriteGlobalSetting(const Settings::SwitchableSetting<u16, true>& setting) {
const QString name = QString::fromStdString(setting.GetLabel());
const u16& value = setting.GetValue(global);
if (!global) {
qt_config->setValue(name + QStringLiteral("/use_global"), setting.UsingGlobal());
}
if (global || !setting.UsingGlobal()) {
qt_config->setValue(name + QStringLiteral("/default"), value == setting.GetDefault());
qt_config->setValue(name, static_cast<u32>(value));
} }
} }
@ -1473,7 +1424,8 @@ void QtConfig::WriteSetting(const QString& name, const QVariant& value) {
void QtConfig::WriteSetting(const QString& name, const QVariant& value, void QtConfig::WriteSetting(const QString& name, const QVariant& value,
const QVariant& default_value) { const QVariant& default_value) {
qt_config->setValue(name + QStringLiteral("/default"), value == default_value); if (global)
qt_config->setValue(name + QStringLiteral("/default"), value == default_value);
qt_config->setValue(name, value); qt_config->setValue(name, value);
} }

3
src/citra_qt/configuration/config.h
View File

@ -131,10 +131,9 @@ private:
template <typename Type, bool ranged> template <typename Type, bool ranged>
void WriteBasicSetting(const Settings::Setting<Type, ranged>& setting); void WriteBasicSetting(const Settings::Setting<Type, ranged>& setting);
template <typename Type, bool ranged> template <typename Type, bool ranged>
void WriteBasicSetting(const Settings::Setting<std::vector<Type>, ranged>& setting); void WriteBasicSetting(const Settings::Setting<std::vector<Type>, ranged>& setting);
ConfigType type; ConfigType type;
std::unique_ptr<QSettings> qt_config; std::unique_ptr<QSettings> qt_config;
std::string qt_config_loc; std::string qt_config_loc;