summaryrefslogtreecommitdiff
path: root/src/yuzu/main.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/main.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/main.h')
-rw-r--r--src/yuzu/main.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/yuzu/main.h b/src/yuzu/main.h
index a60d831b9..6e335b8f8 100644
--- a/src/yuzu/main.h
+++ b/src/yuzu/main.h
@@ -9,6 +9,7 @@
#include <QTimer>
#include "core/core.h"
#include "ui_main.h"
+#include "yuzu/hotkeys.h"
class Config;
class EmuThread;
@@ -172,6 +173,8 @@ private:
// stores default icon theme search paths for the platform
QStringList default_theme_paths;
+ HotkeyRegistry hotkey_registry;
+
protected:
void dropEvent(QDropEvent* event) override;
void dragEnterEvent(QDragEnterEvent* event) override;