diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-08-07 00:43:07 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-08-07 02:28:17 -0400 |
| commit | c8f6754417628d696f81513e34951193f8e5d023 (patch) | |
| tree | 037e8f8951518b9080dbea9740f7173089eb475d /src/yuzu/configuration/configure_dialog.cpp | |
| parent | 826b1394e85720b62938c5f7af4a876e203316af (diff) | |
qt/hotkey: Get rid of global hotkey map instance
Instead, we make a proper registry class and house it within the main
window, then pass it to whatever needs access to the loaded hotkeys.
This way, we avoid a global variable, and don't need to initialize a
std::map instance before the program can do anything.
Diffstat (limited to 'src/yuzu/configuration/configure_dialog.cpp')
| -rw-r--r-- | src/yuzu/configuration/configure_dialog.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/yuzu/configuration/configure_dialog.cpp b/src/yuzu/configuration/configure_dialog.cpp index 1ca7e876ca..cc4b326aef 100644 --- a/src/yuzu/configuration/configure_dialog.cpp +++ b/src/yuzu/configuration/configure_dialog.cpp @@ -6,9 +6,12 @@ #include "ui_configure.h" #include "yuzu/configuration/config.h" #include "yuzu/configuration/configure_dialog.h" +#include "yuzu/hotkeys.h" -ConfigureDialog::ConfigureDialog(QWidget* parent) : QDialog(parent), ui(new Ui::ConfigureDialog) { +ConfigureDialog::ConfigureDialog(QWidget* parent, const HotkeyRegistry& registry) + : QDialog(parent), ui(new Ui::ConfigureDialog) { ui->setupUi(this); + ui->generalTab->PopulateHotkeyList(registry); this->setConfiguration(); } |