Qt6 support for Windows and Mac (#54)

dbermond · web-flow · commit 7b10ea6d64ac · 2021-10-03T14:18:23.000+03:00
This follows commit 25f2184. On Windows, changing the return value of the qHash() variant that takes one argument fixes the following warning on MSVC 2019: qhotkey.cpp:(371,45): warning C4267: 'return': conversion from 'size_t' to 'uint', possible loss of data
diff --git a/QHotkey/qhotkey.cpp b/QHotkey/qhotkey.cpp
@@ -366,7 +366,7 @@ bool QHotkey::NativeShortcut::operator !=(QHotkey::NativeShortcut other) const
 		   valid != other.valid;
 }
 
-uint qHash(QHotkey::NativeShortcut key)
+QHOTKEY_HASH_SEED qHash(QHotkey::NativeShortcut key)
 {
 	return qHash(key.key) ^ qHash(key.modifier);
 }
diff --git a/QHotkey/qhotkey.h b/QHotkey/qhotkey.h
@@ -120,7 +120,7 @@ public slots:
 	bool _registered;
 };
 
-uint QHOTKEY_SHARED_EXPORT qHash(QHotkey::NativeShortcut key);
+QHOTKEY_HASH_SEED QHOTKEY_SHARED_EXPORT qHash(QHotkey::NativeShortcut key);
 QHOTKEY_HASH_SEED QHOTKEY_SHARED_EXPORT qHash(QHotkey::NativeShortcut key, QHOTKEY_HASH_SEED seed);
 
 QHOTKEY_SHARED_EXPORT Q_DECLARE_LOGGING_CATEGORY(logQHotkey)
diff --git a/QHotkey/qhotkey_mac.cpp b/QHotkey/qhotkey_mac.cpp
@@ -7,7 +7,7 @@ class QHotkeyPrivateMac : public QHotkeyPrivate
 {
 public:
 	// QAbstractNativeEventFilter interface
-	bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE;
+	bool nativeEventFilter(const QByteArray &eventType, void *message, _NATIVE_EVENT_RESULT *result) override;
 
 	static OSStatus hotkeyPressEventHandler(EventHandlerCallRef nextHandler, EventRef event, void* data);
 	static OSStatus hotkeyReleaseEventHandler(EventHandlerCallRef nextHandler, EventRef event, void* data);
@@ -33,7 +33,7 @@ bool QHotkeyPrivate::isPlatformSupported()
 bool QHotkeyPrivateMac::isHotkeyHandlerRegistered = false;
 QHash<QHotkey::NativeShortcut, EventHotKeyRef> QHotkeyPrivateMac::hotkeyRefs;
 
-bool QHotkeyPrivateMac::nativeEventFilter(const QByteArray &eventType, void *message, long *result)
+bool QHotkeyPrivateMac::nativeEventFilter(const QByteArray &eventType, void *message, _NATIVE_EVENT_RESULT *result)
 {
 	Q_UNUSED(eventType)
 	Q_UNUSED(message)
@@ -288,4 +288,4 @@ OSStatus QHotkeyPrivateMac::hotkeyReleaseEventHandler(EventHandlerCallRef nextHa
 	}
 
 	return noErr;
-}
+}
diff --git a/QHotkey/qhotkey_p.h b/QHotkey/qhotkey_p.h
@@ -7,6 +7,12 @@
 #include <QMutex>
 #include <QGlobalStatic>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+	#define _NATIVE_EVENT_RESULT qintptr
+#else
+	#define _NATIVE_EVENT_RESULT long
+#endif
+
 class QHOTKEY_SHARED_EXPORT QHotkeyPrivate : public QObject, public QAbstractNativeEventFilter
 {
 	Q_OBJECT
diff --git a/QHotkey/qhotkey_win.cpp b/QHotkey/qhotkey_win.cpp
@@ -15,7 +15,7 @@ class QHotkeyPrivateWin : public QHotkeyPrivate
 public:
 	QHotkeyPrivateWin();
 	// QAbstractNativeEventFilter interface
-	bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE;
+	bool nativeEventFilter(const QByteArray &eventType, void *message, _NATIVE_EVENT_RESULT *result) override;
 
 protected:
 	void pollForHotkeyRelease();
@@ -42,7 +42,7 @@ bool QHotkeyPrivate::isPlatformSupported()
 	return true;
 }
 
-bool QHotkeyPrivateWin::nativeEventFilter(const QByteArray &eventType, void *message, long *result)
+bool QHotkeyPrivateWin::nativeEventFilter(const QByteArray &eventType, void *message, _NATIVE_EVENT_RESULT *result)
 {
 	Q_UNUSED(eventType)
 	Q_UNUSED(result)
diff --git a/QHotkey/qhotkey_x11.cpp b/QHotkey/qhotkey_x11.cpp
@@ -3,13 +3,9 @@
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0)
 	#include <QGuiApplication>
-	
-	#define _NATIVE_EVENT_RESULT qintptr
 #else
 	#include <QDebug>
 	#include <QX11Info>
-	
-	#define _NATIVE_EVENT_RESULT long
 #endif
 
 #include <QThreadStorage>

Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ bool QHotkey::NativeShortcut::operator !=(QHotkey::NativeShortcut other) const`
`366`	`366`	`valid != other.valid;`
`367`	`367`	`}`
`368`	`368`
`369`		`-uint qHash(QHotkey::NativeShortcut key)`
	`369`	`+QHOTKEY_HASH_SEED qHash(QHotkey::NativeShortcut key)`
`370`	`370`	`{`
`371`	`371`	`return qHash(key.key) ^ qHash(key.modifier);`
`372`	`372`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ class QHotkeyPrivateMac : public QHotkeyPrivate`
`7`	`7`	`{`
`8`	`8`	`public:`
`9`	`9`	`// QAbstractNativeEventFilter interface`
`10`		`- bool nativeEventFilter(const QByteArray &eventType, void message, long result) Q_DECL_OVERRIDE;`
	`10`	`+ bool nativeEventFilter(const QByteArray &eventType, void message, _NATIVE_EVENT_RESULT result) override;`
`11`	`11`
`12`	`12`	`static OSStatus hotkeyPressEventHandler(EventHandlerCallRef nextHandler, EventRef event, void* data);`
`13`	`13`	`static OSStatus hotkeyReleaseEventHandler(EventHandlerCallRef nextHandler, EventRef event, void* data);`
`@@ -33,7 +33,7 @@ bool QHotkeyPrivate::isPlatformSupported()`
`33`	`33`	`bool QHotkeyPrivateMac::isHotkeyHandlerRegistered = false;`
`34`	`34`	`QHash<QHotkey::NativeShortcut, EventHotKeyRef> QHotkeyPrivateMac::hotkeyRefs;`
`35`	`35`
`36`		`-bool QHotkeyPrivateMac::nativeEventFilter(const QByteArray &eventType, void message, long result)`
	`36`	`+bool QHotkeyPrivateMac::nativeEventFilter(const QByteArray &eventType, void message, _NATIVE_EVENT_RESULT result)`
`37`	`37`	`{`
`38`	`38`	`Q_UNUSED(eventType)`
`39`	`39`	`Q_UNUSED(message)`
`@@ -288,4 +288,4 @@ OSStatus QHotkeyPrivateMac::hotkeyReleaseEventHandler(EventHandlerCallRef nextHa`
`288`	`288`	`}`
`289`	`289`
`290`	`290`	`return noErr;`
`291`		`-}`
	`291`	`+}`