Add isPlatformSupported() (#28)

* Add isPlatformSupported() * Remove extra semicolons * Add newlines before new methods
Skycoder42 · Jan 7, 2020 · 9583eaf · 9583eaf
1 parent 96a0710
commit 9583eaf
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 7 deletions.
diff --git 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
@@ -57,6 +57,9 @@ class QHOTKEY_SHARED_EXPORT QHotkey : public QObject
 	//! 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
@@ -24,14 +24,19 @@ class QHotkeyPrivateMac : public QHotkeyPrivate
 };
 NATIVE_INSTANCE(QHotkeyPrivateMac)
 
+bool QHotkeyPrivate::isPlatformSupported()
+{
+	return true;
+}
+
 bool QHotkeyPrivateMac::isHotkeyHandlerRegistered = false;
 QHash<QHotkey::NativeShortcut, EventHotKeyRef> 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
@@ -16,6 +16,7 @@ class QHOTKEY_SHARED_EXPORT QHotkeyPrivate : public QObject, public QAbstractNat
 	~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
@@ -23,10 +23,15 @@ class QHotkeyPrivateWin : public QHotkeyPrivate
 };
 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<MSG*>(message);
 	if(msg->message == WM_HOTKEY)

diff --git a/QHotkey/qhotkey_x11.cpp b/QHotkey/qhotkey_x11.cpp
@@ -47,13 +47,18 @@ class QHotkeyPrivateX11 : public QHotkeyPrivate
 };
 NATIVE_INSTANCE(QHotkeyPrivateX11)
 
+bool QHotkeyPrivate::isPlatformSupported()
+{
+	return QX11Info::isPlatformX11();
+}
+
 const QVector<quint32> 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<xcb_generic_event_t *>(message);
 	if (genericEvent->response_type == XCB_KEY_PRESS) {