diff options
author | t895 <[email protected]> | 2023-11-12 02:03:01 -0500 |
---|---|---|
committer | t895 <[email protected]> | 2023-11-21 01:58:13 -0500 |
commit | da14c7b8e47fcd5456d88a033a1fb154a0dcfa39 (patch) | |
tree | 4f9da84775b2b25aaa7eb519bccb1d5e620608a0 /src/yuzu/configuration/configure_ringcon.cpp | |
parent | 8da5bd27e9d4fe5e850700039d79f77e52ba6aea (diff) | |
download | yuzu-android-da14c7b8e47fcd5456d88a033a1fb154a0dcfa39.tar.gz yuzu-android-da14c7b8e47fcd5456d88a033a1fb154a0dcfa39.zip |
config: Unify config handling under frontend_common
Replaces every way of handling config for each frontend with SimpleIni. frontend_common's Config class is at the center where it saves and loads all of the cross-platform settings and provides a set of pure virtual functions for platform specific settings.
As a result of making config handling platform specific, several parts had to be moved to each platform's own config class or to other parts. Default keys were put in platform specific config classes and translatable strings for Qt were moved to shared_translation. Default hotkeys, default_theme, window geometry, and qt metatypes were moved to uisettings. Additionally, to reduce dependence on Qt, QStrings were converted to std::strings where applicable.
Diffstat (limited to 'src/yuzu/configuration/configure_ringcon.cpp')
-rw-r--r-- | src/yuzu/configuration/configure_ringcon.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/yuzu/configuration/configure_ringcon.cpp b/src/yuzu/configuration/configure_ringcon.cpp index f83705544..9572ff43c 100644 --- a/src/yuzu/configuration/configure_ringcon.cpp +++ b/src/yuzu/configuration/configure_ringcon.cpp @@ -8,6 +8,7 @@ #include <QTimer> #include <fmt/format.h> +#include "configuration/qt_config.h" #include "core/hid/emulated_controller.h" #include "core/hid/hid_core.h" #include "input_common/drivers/keyboard.h" @@ -15,7 +16,6 @@ #include "input_common/main.h" #include "ui_configure_ringcon.h" #include "yuzu/bootmanager.h" -#include "yuzu/configuration/config.h" #include "yuzu/configuration/configure_ringcon.h" const std::array<std::string, ConfigureRingController::ANALOG_SUB_BUTTONS_NUM> @@ -270,7 +270,7 @@ void ConfigureRingController::LoadConfiguration() { void ConfigureRingController::RestoreDefaults() { const std::string default_ring_string = InputCommon::GenerateAnalogParamFromKeys( - 0, 0, Config::default_ringcon_analogs[0], Config::default_ringcon_analogs[1], 0, 0.05f); + 0, 0, QtConfig::default_ringcon_analogs[0], QtConfig::default_ringcon_analogs[1], 0, 0.05f); emulated_controller->SetRingParam(Common::ParamPackage(default_ring_string)); UpdateUI(); } |