From 81362834a78f1ab87c0c8d6331e759199d33623b Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 25 Feb 2017 11:24:20 +0100
Subject: qxt: remove ifdefs for Qt4. We're not using it again.

---
 qxt-mini/qxtglobalshortcut_p.h | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'qxt-mini/qxtglobalshortcut_p.h')

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);
 
-- 
cgit v1.2.3