diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-11-25 18:00:06 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-11-25 18:00:06 +0000 |
| commit | 8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a (patch) | |
| tree | 15d339b62e98d5858a57aa787334e14f0e2f0ad7 /src/plugins/General/hotkey/hotkeymanager.h | |
| parent | 6fc05db7c6de9a51beba754f12ff4ac32859977d (diff) | |
| download | qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.tar.gz qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.tar.bz2 qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.zip | |
copy 1.2 branch to trunk
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General/hotkey/hotkeymanager.h')
| -rw-r--r-- | src/plugins/General/hotkey/hotkeymanager.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/General/hotkey/hotkeymanager.h b/src/plugins/General/hotkey/hotkeymanager.h index cf816dd6f..200aa68f4 100644 --- a/src/plugins/General/hotkey/hotkeymanager.h +++ b/src/plugins/General/hotkey/hotkeymanager.h @@ -20,6 +20,7 @@ #ifndef HOTKEYMANAGER_H #define HOTKEYMANAGER_H +#include <QObject> #include <QString> #include <QTableWidgetItem> #include <QList> @@ -80,13 +81,13 @@ public: static QList<long> ignModifiersList(); static quint32 keycodeToKeysym(quint32 keycode); -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 protected: virtual bool eventFilter(QObject* o, QEvent* e); #endif private: -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 static void ensureModifiers(); QList <Hotkey *> m_grabbedKeys; static long m_alt_mask; |