From b285991b886c0097f9d7ef9875eac158b9a3b6c0 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 20 Sep 2020 13:58:17 +0200 Subject: [PATCH] Turn Config::Info into a class with getters --- Source/Core/Common/Config/Config.h | 8 ++--- Source/Core/Common/Config/ConfigInfo.h | 21 +++++++----- Source/Core/Common/Config/Layer.h | 6 ++-- .../Core/ConfigLoaders/BaseConfigLoader.cpp | 13 +++---- .../Core/ConfigLoaders/GameConfigLoader.cpp | 8 ++--- .../Core/ConfigLoaders/IsSettingSaveable.cpp | 34 +++++++++---------- .../DolphinQt/Config/Graphics/GraphicsBool.h | 2 +- .../Config/Graphics/GraphicsInteger.h | 2 +- .../Config/Graphics/GraphicsSlider.h | 2 +- .../DolphinQt/NetPlay/NetPlaySetupDialog.cpp | 8 ++--- Source/Core/UICommon/CommandLineParse.cpp | 9 +++-- Source/Core/UICommon/DiscordPresence.cpp | 2 +- 12 files changed, 62 insertions(+), 53 deletions(-) diff --git a/Source/Core/Common/Config/Config.h b/Source/Core/Common/Config/Config.h index 1fbaef0f88..21662d4167 100644 --- a/Source/Core/Common/Config/Config.h +++ b/Source/Core/Common/Config/Config.h @@ -52,11 +52,11 @@ T Get(LayerType layer, const Info& info) template T Get(const Info& info) { - const std::optional str = GetAsString(info.location); + const std::optional str = GetAsString(info.GetLocation()); if (!str) - return info.default_value; + return info.GetDefaultValue(); - return detail::TryParse(*str).value_or(info.default_value); + return detail::TryParse(*str).value_or(info.GetDefaultValue()); } template @@ -68,7 +68,7 @@ T GetBase(const Info& info) template LayerType GetActiveLayerForConfig(const Info& info) { - return GetActiveLayerForConfig(info.location); + return GetActiveLayerForConfig(info.GetLocation()); } template diff --git a/Source/Core/Common/Config/ConfigInfo.h b/Source/Core/Common/Config/ConfigInfo.h index 20051c1003..56d3a43a31 100644 --- a/Source/Core/Common/Config/ConfigInfo.h +++ b/Source/Core/Common/Config/ConfigInfo.h @@ -30,10 +30,11 @@ struct Location }; template -struct Info +class Info { - Info(const Location& location_, const T& default_value_) - : location{location_}, default_value{default_value_} +public: + constexpr Info(const Location& location, const T& default_value) + : m_location{location}, m_default_value{default_value} { } @@ -41,13 +42,17 @@ struct Info // so that enum settings can still easily work with code that doesn't care about the enum values. template >::value>* = nullptr> - Info(const Info& other) - : location{other.location}, default_value{static_cast>( - other.default_value)} + constexpr Info(const Info& other) + : m_location{other.GetLocation()}, m_default_value{static_cast>( + other.GetDefaultValue())} { } - Location location; - T default_value; + constexpr const Location& GetLocation() const { return m_location; } + constexpr const T& GetDefaultValue() const { return m_default_value; } + +private: + Location m_location; + T m_default_value; }; } // namespace Config diff --git a/Source/Core/Common/Config/Layer.h b/Source/Core/Common/Config/Layer.h index c309810719..cbfbbe6aae 100644 --- a/Source/Core/Common/Config/Layer.h +++ b/Source/Core/Common/Config/Layer.h @@ -45,7 +45,7 @@ inline std::optional TryParse(const std::string& str_value) } // namespace detail template -struct Info; +class Info; class Layer; using LayerMap = std::map>; @@ -105,7 +105,7 @@ public: template T Get(const Info& config_info) const { - return Get(config_info.location).value_or(config_info.default_value); + return Get(config_info.GetLocation()).value_or(config_info.GetDefaultValue()); } template @@ -120,7 +120,7 @@ public: template void Set(const Info& config_info, const std::common_type_t& value) { - Set(config_info.location, value); + Set(config_info.GetLocation(), value); } template diff --git a/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp index eadb007ae6..6598561e32 100644 --- a/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp +++ b/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp @@ -41,7 +41,7 @@ void SaveToSYSCONF(Config::LayerType layer) { std::visit( [layer, &setting, &sysconf](auto& info) { - const std::string key = info.location.section + "." + info.location.key; + const std::string key = info.GetLocation().section + "." + info.GetLocation().key; if (setting.type == SysConf::Entry::Type::Long) { @@ -180,27 +180,28 @@ private: { std::visit( [&](auto& info) { - const std::string key = info.location.section + "." + info.location.key; + const Config::Location location = info.GetLocation(); + const std::string key = location.section + "." + location.key; if (setting.type == SysConf::Entry::Type::Long) { - layer->Set(info.location, sysconf.GetData(key, info.default_value)); + layer->Set(location, sysconf.GetData(key, info.GetDefaultValue())); } else if (setting.type == SysConf::Entry::Type::Byte) { - layer->Set(info.location, sysconf.GetData(key, info.default_value)); + layer->Set(location, sysconf.GetData(key, info.GetDefaultValue())); } else if (setting.type == SysConf::Entry::Type::BigArray) { // Somewhat hacky support for IPL.SADR. The setting only stores the // first 4 bytes even thought the SYSCONF entry is much bigger. - u32 value = info.default_value; + u32 value = info.GetDefaultValue(); SysConf::Entry* entry = sysconf.GetEntry(key); if (entry) { std::memcpy(&value, entry->bytes.data(), std::min(entry->bytes.size(), sizeof(u32))); } - layer->Set(info.location, value); + layer->Set(location, value); } }, setting.config_info); diff --git a/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp index fde97589a1..eb4e71a352 100644 --- a/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp +++ b/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp @@ -69,10 +69,10 @@ using INIToSectionMap = std::map s_setting_saveable = { // Main.Core - &Config::MAIN_DEFAULT_ISO.location, - &Config::MAIN_MEMCARD_A_PATH.location, - &Config::MAIN_MEMCARD_B_PATH.location, - &Config::MAIN_AUTO_DISC_CHANGE.location, - &Config::MAIN_ALLOW_SD_WRITES.location, - &Config::MAIN_DPL2_DECODER.location, - &Config::MAIN_DPL2_QUALITY.location, - &Config::MAIN_RAM_OVERRIDE_ENABLE.location, - &Config::MAIN_MEM1_SIZE.location, - &Config::MAIN_MEM2_SIZE.location, - &Config::MAIN_GFX_BACKEND.location, - &Config::MAIN_ENABLE_SAVESTATES.location, - &Config::MAIN_FALLBACK_REGION.location, + &Config::MAIN_DEFAULT_ISO.GetLocation(), + &Config::MAIN_MEMCARD_A_PATH.GetLocation(), + &Config::MAIN_MEMCARD_B_PATH.GetLocation(), + &Config::MAIN_AUTO_DISC_CHANGE.GetLocation(), + &Config::MAIN_ALLOW_SD_WRITES.GetLocation(), + &Config::MAIN_DPL2_DECODER.GetLocation(), + &Config::MAIN_DPL2_QUALITY.GetLocation(), + &Config::MAIN_RAM_OVERRIDE_ENABLE.GetLocation(), + &Config::MAIN_MEM1_SIZE.GetLocation(), + &Config::MAIN_MEM2_SIZE.GetLocation(), + &Config::MAIN_GFX_BACKEND.GetLocation(), + &Config::MAIN_ENABLE_SAVESTATES.GetLocation(), + &Config::MAIN_FALLBACK_REGION.GetLocation(), // Main.Interface - &Config::MAIN_USE_PANIC_HANDLERS.location, - &Config::MAIN_OSD_MESSAGES.location, + &Config::MAIN_USE_PANIC_HANDLERS.GetLocation(), + &Config::MAIN_OSD_MESSAGES.GetLocation(), // Main.Interface - &Config::MAIN_SKIP_NKIT_WARNING.location, + &Config::MAIN_SKIP_NKIT_WARNING.GetLocation(), // UI.General - &Config::MAIN_USE_DISCORD_PRESENCE.location, + &Config::MAIN_USE_DISCORD_PRESENCE.GetLocation(), }; return std::any_of(s_setting_saveable.cbegin(), s_setting_saveable.cend(), diff --git a/Source/Core/DolphinQt/Config/Graphics/GraphicsBool.h b/Source/Core/DolphinQt/Config/Graphics/GraphicsBool.h index 1d3ceb4d5d..794a210c6e 100644 --- a/Source/Core/DolphinQt/Config/Graphics/GraphicsBool.h +++ b/Source/Core/DolphinQt/Config/Graphics/GraphicsBool.h @@ -10,7 +10,7 @@ namespace Config { template -struct Info; +class Info; } class GraphicsBool : public ToolTipCheckBox diff --git a/Source/Core/DolphinQt/Config/Graphics/GraphicsInteger.h b/Source/Core/DolphinQt/Config/Graphics/GraphicsInteger.h index 4f0cea9cb3..e7d105da89 100644 --- a/Source/Core/DolphinQt/Config/Graphics/GraphicsInteger.h +++ b/Source/Core/DolphinQt/Config/Graphics/GraphicsInteger.h @@ -9,7 +9,7 @@ namespace Config { template -struct Info; +class Info; } class GraphicsInteger : public ToolTipSpinBox diff --git a/Source/Core/DolphinQt/Config/Graphics/GraphicsSlider.h b/Source/Core/DolphinQt/Config/Graphics/GraphicsSlider.h index 9c45f81ac4..9a8cc75fde 100644 --- a/Source/Core/DolphinQt/Config/Graphics/GraphicsSlider.h +++ b/Source/Core/DolphinQt/Config/Graphics/GraphicsSlider.h @@ -9,7 +9,7 @@ namespace Config { template -struct Info; +class Info; } class GraphicsSlider : public ToolTipSlider diff --git a/Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp b/Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp index 521ec48745..12726019f6 100644 --- a/Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp +++ b/Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp @@ -381,13 +381,13 @@ void NetPlaySetupDialog::PopulateGameList() void NetPlaySetupDialog::ResetTraversalHost() { Config::SetBaseOrCurrent(Config::NETPLAY_TRAVERSAL_SERVER, - Config::NETPLAY_TRAVERSAL_SERVER.default_value); + Config::NETPLAY_TRAVERSAL_SERVER.GetDefaultValue()); Config::SetBaseOrCurrent(Config::NETPLAY_TRAVERSAL_PORT, - Config::NETPLAY_TRAVERSAL_PORT.default_value); + Config::NETPLAY_TRAVERSAL_PORT.GetDefaultValue()); ModalMessageBox::information( this, tr("Reset Traversal Server"), tr("Reset Traversal Server to %1:%2") - .arg(QString::fromStdString(Config::NETPLAY_TRAVERSAL_SERVER.default_value), - QString::number(Config::NETPLAY_TRAVERSAL_PORT.default_value))); + .arg(QString::fromStdString(Config::NETPLAY_TRAVERSAL_SERVER.GetDefaultValue()), + QString::number(Config::NETPLAY_TRAVERSAL_PORT.GetDefaultValue()))); } diff --git a/Source/Core/UICommon/CommandLineParse.cpp b/Source/Core/UICommon/CommandLineParse.cpp index 6c06cb2ef2..5d37d34b32 100644 --- a/Source/Core/UICommon/CommandLineParse.cpp +++ b/Source/Core/UICommon/CommandLineParse.cpp @@ -26,15 +26,18 @@ public: : ConfigLayerLoader(Config::LayerType::CommandLine) { if (!video_backend.empty()) - m_values.emplace_back(Config::MAIN_GFX_BACKEND.location, video_backend); + m_values.emplace_back(Config::MAIN_GFX_BACKEND.GetLocation(), video_backend); if (!audio_backend.empty()) - m_values.emplace_back(Config::MAIN_DSP_HLE.location, ValueToString(audio_backend == "HLE")); + { + m_values.emplace_back(Config::MAIN_DSP_HLE.GetLocation(), + ValueToString(audio_backend == "HLE")); + } // Batch mode hides the main window, and render to main hides the render window. To avoid a // situation where we would have no window at all, disable render to main when using batch mode. if (batch) - m_values.emplace_back(Config::MAIN_RENDER_TO_MAIN.location, ValueToString(false)); + m_values.emplace_back(Config::MAIN_RENDER_TO_MAIN.GetLocation(), ValueToString(false)); // Arguments are in the format of .
.=Value for (const auto& arg : args) diff --git a/Source/Core/UICommon/DiscordPresence.cpp b/Source/Core/UICommon/DiscordPresence.cpp index c1aab0720b..de3d6973d7 100644 --- a/Source/Core/UICommon/DiscordPresence.cpp +++ b/Source/Core/UICommon/DiscordPresence.cpp @@ -50,7 +50,7 @@ void HandleDiscordJoin(const char* join_secret) if (event_handler == nullptr) return; - if (Config::Get(Config::NETPLAY_NICKNAME) == Config::NETPLAY_NICKNAME.default_value) + if (Config::Get(Config::NETPLAY_NICKNAME) == Config::NETPLAY_NICKNAME.GetDefaultValue()) Config::SetCurrent(Config::NETPLAY_NICKNAME, username); std::string secret(join_secret);