From 9583eafe76186128ae77f4f02505ca777c1855d3 Mon Sep 17 00:00:00 2001 From: Hennadii Chernyshchyk Date: Tue, 7 Jan 2020 10:31:37 +0200 Subject: [PATCH] Add isPlatformSupported() (#28) * Add isPlatformSupported() * Remove extra semicolons * Add newlines before new methods --- QHotkey/qhotkey.cpp | 5 +++++ QHotkey/qhotkey.h | 3 +++ QHotkey/qhotkey_mac.cpp | 11 ++++++++--- QHotkey/qhotkey_p.h | 1 + QHotkey/qhotkey_win.cpp | 9 +++++++-- QHotkey/qhotkey_x11.cpp | 9 +++++++-- 6 files changed, 31 insertions(+), 7 deletions(-) diff --git a/QHotkey/qhotkey.cpp b/QHotkey/qhotkey.cpp index 8b11bdd..8dadc08 100644 --- a/QHotkey/qhotkey.cpp +++ b/QHotkey/qhotkey.cpp @@ -16,6 +16,11 @@ void QHotkey::addGlobalMapping(const QKeySequence &shortcut, const QHotkey::Nati Q_ARG(QHotkey::NativeShortcut, nativeShortcut)); } +bool QHotkey::isPlatformSupported() +{ + return QHotkeyPrivate::isPlatformSupported(); +} + QHotkey::QHotkey(QObject *parent) : QObject(parent), _keyCode(Qt::Key_unknown), diff --git a/QHotkey/qhotkey.h b/QHotkey/qhotkey.h index 133ef25..479dff5 100644 --- a/QHotkey/qhotkey.h +++ b/QHotkey/qhotkey.h @@ -57,6 +57,9 @@ public: //! Adds a global mapping of a key sequence to a replacement native shortcut static void addGlobalMapping(const QKeySequence &shortcut, const NativeShortcut &nativeShortcut); + //! Checks if global shortcuts are supported by the current platform + static bool isPlatformSupported(); + //! Default Constructor explicit QHotkey(QObject *parent = nullptr); //! Constructs a hotkey with a shortcut and optionally registers it diff --git a/QHotkey/qhotkey_mac.cpp b/QHotkey/qhotkey_mac.cpp index ac123bf..a410373 100644 --- a/QHotkey/qhotkey_mac.cpp +++ b/QHotkey/qhotkey_mac.cpp @@ -24,14 +24,19 @@ private: }; NATIVE_INSTANCE(QHotkeyPrivateMac) +bool QHotkeyPrivate::isPlatformSupported() +{ + return true; +} + bool QHotkeyPrivateMac::isHotkeyHandlerRegistered = false; QHash QHotkeyPrivateMac::hotkeyRefs; bool QHotkeyPrivateMac::nativeEventFilter(const QByteArray &eventType, void *message, long *result) { - Q_UNUSED(eventType); - Q_UNUSED(message); - Q_UNUSED(result); + Q_UNUSED(eventType) + Q_UNUSED(message) + Q_UNUSED(result) return false; } diff --git a/QHotkey/qhotkey_p.h b/QHotkey/qhotkey_p.h index 9e9e0ae..847f7db 100644 --- a/QHotkey/qhotkey_p.h +++ b/QHotkey/qhotkey_p.h @@ -16,6 +16,7 @@ public: ~QHotkeyPrivate(); static QHotkeyPrivate *instance(); + static bool isPlatformSupported(); QHotkey::NativeShortcut nativeShortcut(Qt::Key keycode, Qt::KeyboardModifiers modifiers); diff --git a/QHotkey/qhotkey_win.cpp b/QHotkey/qhotkey_win.cpp index 6b458a5..ead6763 100644 --- a/QHotkey/qhotkey_win.cpp +++ b/QHotkey/qhotkey_win.cpp @@ -23,10 +23,15 @@ private: }; NATIVE_INSTANCE(QHotkeyPrivateWin) +bool QHotkeyPrivate::isPlatformSupported() +{ + return true; +} + bool QHotkeyPrivateWin::nativeEventFilter(const QByteArray &eventType, void *message, long *result) { - Q_UNUSED(eventType); - Q_UNUSED(result); + Q_UNUSED(eventType) + Q_UNUSED(result) MSG* msg = static_cast(message); if(msg->message == WM_HOTKEY) diff --git a/QHotkey/qhotkey_x11.cpp b/QHotkey/qhotkey_x11.cpp index a3e48ee..43f8956 100644 --- a/QHotkey/qhotkey_x11.cpp +++ b/QHotkey/qhotkey_x11.cpp @@ -47,13 +47,18 @@ private: }; NATIVE_INSTANCE(QHotkeyPrivateX11) +bool QHotkeyPrivate::isPlatformSupported() +{ + return QX11Info::isPlatformX11(); +} + const QVector QHotkeyPrivateX11::specialModifiers = {0, Mod2Mask, LockMask, (Mod2Mask | LockMask)}; const quint32 QHotkeyPrivateX11::validModsMask = ShiftMask | ControlMask | Mod1Mask | Mod4Mask; bool QHotkeyPrivateX11::nativeEventFilter(const QByteArray &eventType, void *message, long *result) { - Q_UNUSED(eventType); - Q_UNUSED(result); + Q_UNUSED(eventType) + Q_UNUSED(result) xcb_generic_event_t *genericEvent = static_cast(message); if (genericEvent->response_type == XCB_KEY_PRESS) {