diff options
author | bunnei <bunneidev@gmail.com> | 2018-08-07 14:45:45 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-07 14:45:45 -0400 |
commit | 3242e7c16402b39ac0e4b7f044600f60a900bbbf (patch) | |
tree | 59fe3c49811b91299e3be12b3e27d1faa970cea4 /src/yuzu/configuration/configure_general.h | |
parent | c7072406855441284827e936eac4b871cb35544d (diff) | |
parent | c8f6754417628d696f81513e34951193f8e5d023 (diff) |
Merge pull request #950 from lioncash/hotkey
qt/hotkey: Get rid of global hotkey map instance
Diffstat (limited to 'src/yuzu/configuration/configure_general.h')
-rw-r--r-- | src/yuzu/configuration/configure_general.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/yuzu/configuration/configure_general.h b/src/yuzu/configuration/configure_general.h index 447552d8c..4770034cc 100644 --- a/src/yuzu/configuration/configure_general.h +++ b/src/yuzu/configuration/configure_general.h @@ -7,6 +7,8 @@ #include <memory> #include <QWidget> +class HotkeyRegistry; + namespace Ui { class ConfigureGeneral; } @@ -18,11 +20,11 @@ public: explicit ConfigureGeneral(QWidget* parent = nullptr); ~ConfigureGeneral(); + void PopulateHotkeyList(const HotkeyRegistry& registry); void applyConfiguration(); private: void setConfiguration(); -private: std::unique_ptr<Ui::ConfigureGeneral> ui; }; |