--- a/src/SpacenavReceiver.h	Thu Mar 07 15:41:38 2019 +0100
+++ b/src/SpacenavReceiver.h	Thu Mar 07 16:20:51 2019 +0100
@@ -22,7 +22,8 @@
 
 #include "SpacenavWrapper.h"
 
-Q_DECLARE_METATYPE(SpacenavWrapper::Event)
+Q_DECLARE_METATYPE(SpacenavWrapper::Event::MotionEvent)
+Q_DECLARE_METATYPE(SpacenavWrapper::Event::ButtonEvent)
 
 class SpacenavReceiver : public QThread {
 	Q_OBJECT
@@ -37,10 +38,12 @@
 	void run() {
 		while (true) {
 			SpacenavWrapper::Event e = spnav.waitEvent();
-			emit spacenavEvent(e);
+			if (e.type == SpacenavWrapper::Event::Type::MOTION) emit spacenavMotionEvent(e.motion);
+			if (e.type == SpacenavWrapper::Event::Type::BUTTON) emit spacenavButtonEvent(e.button);
 		}
 	}
 
 signals:
-	void spacenavEvent(SpacenavWrapper::Event e);
+	void spacenavMotionEvent(SpacenavWrapper::Event::MotionEvent e);
+	void spacenavButtonEvent(SpacenavWrapper::Event::ButtonEvent e);
 };
\ No newline at end of file