Changeset 181 for smplayer/trunk/src/myapplication.h

Timestamp:

Aug 31, 2016, 5:31:04 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.8.0

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/myapplication.h (modified) (5 diffs)

smplayer/trunk/src/myapplication.h

@@ -23 +23 @@
 
 #ifdef Q_OS_WIN
- #if QT_VERSION < 0x050000
-  #define USE_WINEVENTFILTER
- #endif
+  //#define USE_WINEVENTFILTER
+#endif
+
+#if defined(USE_WINEVENTFILTER) && QT_VERSION >= 0x050000
+#include <QAbstractNativeEventFilter>
 #endif
 
@@ -32 +34 @@
 
 class MyApplication : public QtSingleApplication
+#if defined(USE_WINEVENTFILTER) && QT_VERSION >= 0x050000
+, QAbstractNativeEventFilter
+#endif
 {
         Q_OBJECT
 
 public:
-        MyApplication ( const QString & appId, int & argc, char ** argv ) 
-                : QtSingleApplication(appId, argc, argv) {};
+        MyApplication ( const QString & appId, int & argc, char ** argv );
 
         virtual void commitData ( QSessionManager & /*manager*/ ) {
@@ -49 +53 @@
 #ifdef USE_WINEVENTFILTER
         virtual bool winEventFilter(MSG * msg, long * result);
+        #if QT_VERSION >= 0x050000
+        virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long *result);
+        #endif
 #endif
 };
@@ -56 +63 @@
 
 class MyApplication : public QApplication
+#if defined(USE_WINEVENTFILTER) && QT_VERSION >= 0x050000
+, QAbstractNativeEventFilter
+#endif
 {
         Q_OBJECT
 
 public:
-        MyApplication ( const QString & appId, int & argc, char ** argv ) : QApplication(argc, argv) {};
+        MyApplication ( const QString & appId, int & argc, char ** argv );
 
         virtual void commitData ( QSessionManager & /*manager*/ ) {
@@ -68 +78 @@
 #ifdef USE_WINEVENTFILTER
         virtual bool winEventFilter(MSG * msg, long * result);
+        #if QT_VERSION >= 0x050000
+        virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long *result);
+        #endif
 #endif
 };