diff options
author | bunnei <bunneidev@gmail.com> | 2020-08-28 09:57:50 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-28 09:57:50 -0400 |
commit | 45b73ba840411fa61c75e6fe954b9a46ca5d59b6 (patch) | |
tree | c99333f0b6b386bfb80712d8e6ffa94bef04a9ff /src/yuzu/configuration/configure_mouse_advanced.h | |
parent | 40320a1d8428f9079d43a363421083678c4a9042 (diff) | |
parent | 9e1b0af25907f7a8b960aa5c1e7d931691f40196 (diff) |
Merge pull request #4544 from lioncash/input-sub
input_common: Eliminate most global state
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; |