diff options
author | Lioncash <mathew1800@gmail.com> | 2020-08-27 15:16:47 -0400 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2020-08-27 16:11:17 -0400 |
commit | 9e1b0af25907f7a8b960aa5c1e7d931691f40196 (patch) | |
tree | 9bfda0b559cb025da3bc65168d28ee78144daa20 /src/yuzu/configuration/configure_mouse_advanced.h | |
parent | 3db9a259771a44278ff34168ba140c2c7815a1cf (diff) |
input_common: Eliminate most global state
Abstracts most of the input mechanisms under an InputSubsystem class
that is managed by the frontends, eliminating any static constructors
and destructors. This gets rid of global accessor functions and also
allows the frontends to have a more fine-grained control over the
lifecycle of the input subsystem.
This also makes it explicit which interfaces rely on the input subsystem
instead of making it opaque in the interface functions. All that remains
to migrate over is the factories, which can be done in a separate
change.
Diffstat (limited to 'src/yuzu/configuration/configure_mouse_advanced.h')
-rw-r--r-- | src/yuzu/configuration/configure_mouse_advanced.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/yuzu/configuration/configure_mouse_advanced.h b/src/yuzu/configuration/configure_mouse_advanced.h index e7d27dab7..65b6fca9a 100644 --- a/src/yuzu/configuration/configure_mouse_advanced.h +++ b/src/yuzu/configuration/configure_mouse_advanced.h @@ -8,12 +8,14 @@ #include <optional> #include <QDialog> -#include "core/settings.h" - class QCheckBox; class QPushButton; class QTimer; +namespace InputCommon { +class InputSubsystem; +} + namespace Ui { class ConfigureMouseAdvanced; } @@ -22,7 +24,7 @@ class ConfigureMouseAdvanced : public QDialog { Q_OBJECT public: - explicit ConfigureMouseAdvanced(QWidget* parent); + explicit ConfigureMouseAdvanced(QWidget* parent, InputCommon::InputSubsystem* input_subsystem_); ~ConfigureMouseAdvanced() override; void ApplyConfiguration(); @@ -57,6 +59,8 @@ private: std::unique_ptr<Ui::ConfigureMouseAdvanced> ui; + InputCommon::InputSubsystem* input_subsystem; + /// This will be the the setting function when an input is awaiting configuration. std::optional<std::function<void(const Common::ParamPackage&)>> input_setter; |