aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/General/hotkey/hotkeymanager.h
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2018-07-08 12:30:55 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2018-07-08 12:30:55 +0000
commita64bdac272a1f37474576b33a7d72988e3efe80d (patch)
treeb04ea1c01bfdc60e91fc4588afb99287e8734840 /src/plugins/General/hotkey/hotkeymanager.h
parent4149f5a659c6ee7c150d1ed7176127a5518bce32 (diff)
downloadqmmp-a64bdac272a1f37474576b33a7d72988e3efe80d.tar.gz
qmmp-a64bdac272a1f37474576b33a7d72988e3efe80d.tar.bz2
qmmp-a64bdac272a1f37474576b33a7d72988e3efe80d.zip
hotkey: fixed windows support
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8119 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General/hotkey/hotkeymanager.h')
-rw-r--r--src/plugins/General/hotkey/hotkeymanager.h32
1 files changed, 11 insertions, 21 deletions
diff --git a/src/plugins/General/hotkey/hotkeymanager.h b/src/plugins/General/hotkey/hotkeymanager.h
index 16176bfe6..ec5278982 100644
--- a/src/plugins/General/hotkey/hotkeymanager.h
+++ b/src/plugins/General/hotkey/hotkeymanager.h
@@ -25,11 +25,11 @@
#include <QTableWidgetItem>
#include <QList>
#include <QAbstractNativeEventFilter>
+#ifdef Q_OS_WIN
+#include <windows.h>
+#endif
#include <qmmpui/general.h>
-class QEvent;
-class QWidget;
-
/**
@author Ilya Kotov <forkotov02@ya.ru>
*/
@@ -54,18 +54,14 @@ public:
VOLUME_MUTE
};
- Hotkey()
- {
- action = PLAY;
- key = 0;
- mod = 0;
- code = 0;
- }
-
- quint32 mod;
- quint32 key;
- int action;
- int code;
+ quint32 mod = 0;
+ quint32 key = 0;
+ int action = PLAY;
+ int code = 0;
+#ifdef Q_OS_WIN
+ UINT mods = 0;
+ WPARAM id = 0;
+#endif
quint32 defaultKey();
static quint32 defaultKey(int act);
};
@@ -84,13 +80,7 @@ public:
private:
bool nativeEventFilter(const QByteArray &eventType, void *message, long *result);
-#ifdef QMMP_WS_X11
QList <Hotkey *> m_grabbedKeys;
-#endif
-
-#ifdef Q_OS_WIN
- QList<QAbstractNativeEventFilter *> m_filters;
-#endif
};
#endif