summaryrefslogtreecommitdiff
path: root/src/yuzu/configuration/configure_general.h
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-08-07 00:43:07 -0400
committerLioncash <mathew1800@gmail.com>2018-08-07 02:28:17 -0400
commitc8f6754417628d696f81513e34951193f8e5d023 (patch)
tree037e8f8951518b9080dbea9740f7173089eb475d /src/yuzu/configuration/configure_general.h
parent826b1394e85720b62938c5f7af4a876e203316af (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_general.h')
-rw-r--r--src/yuzu/configuration/configure_general.h4
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;
};