dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make GlobalShortcut::nativeEventFilter compatible with Qt 6

Browse Source
This commit is contained in:
Jonas Kvinge
2020-07-18 04:18:46 +02:00
parent 6154ae7342
commit 5f49567bf7
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/globalshortcuts/globalshortcut-win.cpp
View File

@@ -54,7 +54,12 @@ bool GlobalShortcut::unregisterShortcut(quint32 native_key, quint32 native_mods)
return UnregisterHotKey(0, native_mods ^ native_key); return UnregisterHotKey(0, native_mods ^ native_key);
} }
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool GlobalShortcut::nativeEventFilter(const QByteArray &eventtype, void *message, qintptr *result) {
#else
bool GlobalShortcut::nativeEventFilter(const QByteArray &eventtype, void *message, long *result) { bool GlobalShortcut::nativeEventFilter(const QByteArray &eventtype, void *message, long *result) {
#endif
Q_UNUSED(eventtype); Q_UNUSED(eventtype);
Q_UNUSED(result); Q_UNUSED(result);

4
src/globalshortcuts/globalshortcut-x11.cpp
View File

@@ -82,7 +82,11 @@ bool GlobalShortcut::unregisterShortcut(quint32 native_key, quint32 native_mods)
return true; return true;
} }
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool GlobalShortcut::nativeEventFilter(const QByteArray &eventtype, void *message, qintptr *result) {
#else
bool GlobalShortcut::nativeEventFilter(const QByteArray &eventtype, void *message, long *result) { bool GlobalShortcut::nativeEventFilter(const QByteArray &eventtype, void *message, long *result) {
#endif
Q_UNUSED(eventtype); Q_UNUSED(eventtype);
Q_UNUSED(result); Q_UNUSED(result);

4
src/globalshortcuts/globalshortcut.h
View File

@@ -61,7 +61,11 @@ class GlobalShortcut : public QObject, QAbstractNativeEventFilter {
bool registerShortcut(quint32 native_key, quint32 native_mods); bool registerShortcut(quint32 native_key, quint32 native_mods);
bool unregisterShortcut(quint32 native_key, quint32 native_mods); bool unregisterShortcut(quint32 native_key, quint32 native_mods);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool nativeEventFilter(const QByteArray &eventtype, void *message, qintptr *result) override;
#else
bool nativeEventFilter(const QByteArray &eventtype, void *message, long *result) override; bool nativeEventFilter(const QByteArray &eventtype, void *message, long *result) override;
#endif
static GlobalShortcut *initialized_; static GlobalShortcut *initialized_;
static QHash<QPair<quint32, quint32>, GlobalShortcut*> internal_shortcuts_; static QHash<QPair<quint32, quint32>, GlobalShortcut*> internal_shortcuts_;