summaryrefslogtreecommitdiffhomepage
path: root/qxt-mini/qxtglobalshortcut_p.h
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2017-02-25 11:24:20 +0100
committerStanislaw Halik <sthalik@misaki.pl>2017-02-25 14:19:59 +0100
commit81362834a78f1ab87c0c8d6331e759199d33623b (patch)
treeed95a41d874d756a06382634f737344661603687 /qxt-mini/qxtglobalshortcut_p.h
parent9ad579e6581cd95edb156cb758cbd329779aecd7 (diff)
qxt: remove ifdefs for Qt4. We're not using it again.
Diffstat (limited to 'qxt-mini/qxtglobalshortcut_p.h')
-rw-r--r--qxt-mini/qxtglobalshortcut_p.h15
1 files changed, 3 insertions, 12 deletions
diff --git a/qxt-mini/qxtglobalshortcut_p.h b/qxt-mini/qxtglobalshortcut_p.h
index 407f968e..9eadbc7f 100644
--- a/qxt-mini/qxtglobalshortcut_p.h
+++ b/qxt-mini/qxtglobalshortcut_p.h
@@ -36,19 +36,14 @@
#include <QKeySequence>
#include <QHash>
-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
#include <QAbstractNativeEventFilter>
-#endif
-class QxtGlobalShortcutPrivate : public QxtPrivate<QxtGlobalShortcut>
-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
- ,public QAbstractNativeEventFilter
-#endif
+class QxtGlobalShortcutPrivate : public QxtPrivate<QxtGlobalShortcut>, public QAbstractNativeEventFilter
{
public:
QXT_DECLARE_PUBLIC(QxtGlobalShortcut)
QxtGlobalShortcutPrivate();
- ~QxtGlobalShortcutPrivate();
+ ~QxtGlobalShortcutPrivate() override;
bool enabled;
Qt::Key key;
@@ -59,12 +54,8 @@ public:
static bool error;
static int ref;
-# if QT_VERSION < QT_VERSION_CHECK(5,0,0)
- static QAbstractEventDispatcher::EventFilter prevEventFilter;
-# else
static bool eventFilter(void* message);
- virtual bool nativeEventFilter(const QByteArray & eventType, void * message, long * result);
-# endif // QT_VERSION < QT_VERSION_CHECK(5,0,0)
+ bool nativeEventFilter(const QByteArray & eventType, void * message, long * result) override;
static void activateShortcut(quint32 nativeKey, quint32 nativeMods);