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_dialog.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_dialog.h')
| -rw-r--r-- | src/yuzu/configuration/configure_dialog.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/yuzu/configuration/configure_dialog.h b/src/yuzu/configuration/configure_dialog.h index 21fa1f501..bbbdacc29 100644 --- a/src/yuzu/configuration/configure_dialog.h +++ b/src/yuzu/configuration/configure_dialog.h @@ -7,6 +7,8 @@ #include <memory> #include <QDialog> +class HotkeyRegistry; + namespace Ui { class ConfigureDialog; } @@ -15,7 +17,7 @@ class ConfigureDialog : public QDialog { Q_OBJECT public: - explicit ConfigureDialog(QWidget* parent); + explicit ConfigureDialog(QWidget* parent, const HotkeyRegistry& registry); ~ConfigureDialog(); void applyConfiguration(); |