From 22ddac1582c7d6355168ae7bde21393acdf3a6f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Tue, 2 Sep 2014 09:33:42 +0200 Subject: [PATCH] [kwin_wayland] Fix enum arguments in Q_SIGNALS Need to be fully specified and declared as a metatype. --- src/wayland/keyboard.h | 2 +- src/wayland/pointer.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/wayland/keyboard.h b/src/wayland/keyboard.h index d275f9a958..509112219c 100644 --- a/src/wayland/keyboard.h +++ b/src/wayland/keyboard.h @@ -61,7 +61,7 @@ public: Q_SIGNALS: void keymapChanged(int fd, quint32 size); - void keyChanged(quint32 key, KeyState state, quint32 time); + void keyChanged(quint32 key, KWin::Wayland::Keyboard::KeyState state, quint32 time); void modifiersChanged(quint32 depressed, quint32 latched, quint32 locked, quint32 group); private: diff --git a/src/wayland/pointer.h b/src/wayland/pointer.h index 82f86dbb3c..1e7aefe844 100644 --- a/src/wayland/pointer.h +++ b/src/wayland/pointer.h @@ -77,8 +77,8 @@ Q_SIGNALS: void entered(quint32 serial, const QPointF &relativeToSurface); void left(quint32 serial); void motion(const QPointF &relativeToSurface, quint32 time); - void buttonStateChanged(quint32 serial, quint32 time, quint32 button, ButtonState state); - void axisChanged(quint32 time, Axis axis, qreal delta); + void buttonStateChanged(quint32 serial, quint32 time, quint32 button, KWin::Wayland::Pointer::ButtonState state); + void axisChanged(quint32 time, KWin::Wayland::Pointer::Axis axis, qreal delta); private: void enter(uint32_t serial, wl_surface *surface, const QPointF &relativeToSurface); @@ -92,5 +92,6 @@ private: } Q_DECLARE_METATYPE(KWin::Wayland::Pointer::ButtonState) +Q_DECLARE_METATYPE(KWin::Wayland::Pointer::Axis) #endif