mirror of
https://github.com/yuzu-emu/yuzu-android
synced 2024-11-22 21:23:44 +00:00
Merge pull request #12570 from t895/generic-config-pain
frontend_common: config: Move WriteIntegerSetting definition to header
This commit is contained in:
commit
8d3463dbdd
2 changed files with 11 additions and 16 deletions
|
@ -762,17 +762,6 @@ void Config::WriteBooleanSetting(const std::string& key, const bool& value,
|
||||||
WritePreparedSetting(key, AdjustOutputString(ToString(value)), string_default, use_global);
|
WritePreparedSetting(key, AdjustOutputString(ToString(value)), string_default, use_global);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
std::enable_if_t<std::is_integral_v<T>> Config::WriteIntegerSetting(
|
|
||||||
const std::string& key, const T& value, const std::optional<T>& default_value,
|
|
||||||
const std::optional<bool>& use_global) {
|
|
||||||
std::optional<std::string> string_default = std::nullopt;
|
|
||||||
if (default_value.has_value()) {
|
|
||||||
string_default = std::make_optional(ToString(default_value.value()));
|
|
||||||
}
|
|
||||||
WritePreparedSetting(key, AdjustOutputString(ToString(value)), string_default, use_global);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Config::WriteDoubleSetting(const std::string& key, const double& value,
|
void Config::WriteDoubleSetting(const std::string& key, const double& value,
|
||||||
const std::optional<double>& default_value,
|
const std::optional<double>& default_value,
|
||||||
const std::optional<bool>& use_global) {
|
const std::optional<bool>& use_global) {
|
||||||
|
|
|
@ -157,17 +157,23 @@ protected:
|
||||||
void WriteBooleanSetting(const std::string& key, const bool& value,
|
void WriteBooleanSetting(const std::string& key, const bool& value,
|
||||||
const std::optional<bool>& default_value = std::nullopt,
|
const std::optional<bool>& default_value = std::nullopt,
|
||||||
const std::optional<bool>& use_global = std::nullopt);
|
const std::optional<bool>& use_global = std::nullopt);
|
||||||
template <typename T>
|
|
||||||
std::enable_if_t<std::is_integral_v<T>> WriteIntegerSetting(
|
|
||||||
const std::string& key, const T& value,
|
|
||||||
const std::optional<T>& default_value = std::nullopt,
|
|
||||||
const std::optional<bool>& use_global = std::nullopt);
|
|
||||||
void WriteDoubleSetting(const std::string& key, const double& value,
|
void WriteDoubleSetting(const std::string& key, const double& value,
|
||||||
const std::optional<double>& default_value = std::nullopt,
|
const std::optional<double>& default_value = std::nullopt,
|
||||||
const std::optional<bool>& use_global = std::nullopt);
|
const std::optional<bool>& use_global = std::nullopt);
|
||||||
void WriteStringSetting(const std::string& key, const std::string& value,
|
void WriteStringSetting(const std::string& key, const std::string& value,
|
||||||
const std::optional<std::string>& default_value = std::nullopt,
|
const std::optional<std::string>& default_value = std::nullopt,
|
||||||
const std::optional<bool>& use_global = std::nullopt);
|
const std::optional<bool>& use_global = std::nullopt);
|
||||||
|
template <typename T>
|
||||||
|
std::enable_if_t<std::is_integral_v<T>> WriteIntegerSetting(
|
||||||
|
const std::string& key, const T& value,
|
||||||
|
const std::optional<T>& default_value = std::nullopt,
|
||||||
|
const std::optional<bool>& use_global = std::nullopt) {
|
||||||
|
std::optional<std::string> string_default = std::nullopt;
|
||||||
|
if (default_value.has_value()) {
|
||||||
|
string_default = std::make_optional(ToString(default_value.value()));
|
||||||
|
}
|
||||||
|
WritePreparedSetting(key, AdjustOutputString(ToString(value)), string_default, use_global);
|
||||||
|
}
|
||||||
|
|
||||||
void ReadCategory(Settings::Category category);
|
void ReadCategory(Settings::Category category);
|
||||||
void WriteCategory(Settings::Category category);
|
void WriteCategory(Settings::Category category);
|
||||||
|
|
Loading…
Reference in a new issue