1 files changed, 10 insertions, 6 deletions
diff --git a/gui/keyboard.h b/gui/keyboard.h
index c17a7bad..ea35d372 100644
--- a/gui/keyboard.h
+++ b/gui/keyboard.h
@@ -17,20 +17,24 @@
 #include "ui_keyboard_listener.h"
 
 #include <QDialog>
-#include <QKeyEvent>
+#include <QtEvents>
 
 class OTR_GUI_EXPORT keyboard_listener : public QDialog
 {
     Q_OBJECT
-    Ui_keyboard_listener ui;
+
 #ifdef _WIN32
-    KeybindingWorker::Token token;
+    void receive_key(const Key& k);
+
+    KeybindingWorker::Token token{[this](const Key& k) {receive_key(k);}};
+#else
+    void keyPressEvent(QKeyEvent* event) override;
 #endif
+
+    Ui_keyboard_listener ui;
+
 public:
     keyboard_listener(QWidget* parent = nullptr);
-#ifndef _WIN32
-    void keyPressEvent(QKeyEvent* event) override;
-#endif
 signals:
     void key_pressed(QKeySequence k);
     void joystick_button_pressed(QString guid, int idx, bool held);