diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-02 08:52:18 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-02 08:52:18 +0200 |
| commit | f1431409454f3b03c7e7ecb3a119c8b552c3443f (patch) | |
| tree | f97038addf3283cfbb2015fcb123494d0f7fee73 /opentrack/win32-shortcuts.h | |
| parent | 4bc6c9e69170f2e4aa9bdcd908fda7027bcae044 (diff) | |
| parent | 68d33b0c99cfac8f89c2224d457e1568232896f7 (diff) | |
Merge branch 'unstable' into trackhat-ui
* unstable:
shortcuts: use dinput for consistency on win32
shortcuts: use our own timer, other one is thread-bound
shortcuts: implement dinput -> qt conversion
shortcuts: rework KeybindingWorker for win32
Diffstat (limited to 'opentrack/win32-shortcuts.h')
| -rw-r--r-- | opentrack/win32-shortcuts.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/opentrack/win32-shortcuts.h b/opentrack/win32-shortcuts.h index 3e824b89..fe92ae53 100644 --- a/opentrack/win32-shortcuts.h +++ b/opentrack/win32-shortcuts.h @@ -3,6 +3,7 @@ #ifdef _WIN32 #include <QKeySequence> +#include "opentrack/shortcuts.h" struct win_key; @@ -15,6 +16,7 @@ struct win_key int win; Qt::Key qt; static bool from_qt(QKeySequence qt_, int& dik, Qt::KeyboardModifiers &mods); + static bool to_qt(const Key& k, QKeySequence& qt_, Qt::KeyboardModifiers &mods); }; #endif |