From c6281ac64e31d009d47ede790ce51d81230022ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Wed, 26 Nov 2014 11:57:10 +0100
Subject: [PATCH] Move pointer position into the Pointer struct in
 SeatInterface::Private

---
 src/wayland/seat_interface.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/wayland/seat_interface.cpp b/src/wayland/seat_interface.cpp
index d7eef371ca..cd0e693fce 100644
--- a/src/wayland/seat_interface.cpp
+++ b/src/wayland/seat_interface.cpp
@@ -69,7 +69,6 @@ public:
     QVector<PointerInterface*> pointers;
 
     // Pointer related members
-    QPointF pointerPos;
     struct Pointer {
         enum class ButtonState {
             Released,
@@ -77,6 +76,7 @@ public:
         };
         QHash<quint32, quint32> buttonSerials;
         QHash<quint32, ButtonState> buttonStates;
+        QPointF pos;
     };
     Pointer globalPointer;
     void updatePointerButtonSerial(quint32 button, quint32 serial);
@@ -354,16 +354,16 @@ SeatInterface::Private *SeatInterface::d_func() const
 QPointF SeatInterface::pointerPos() const
 {
     Q_D();
-    return d->pointerPos;
+    return d->globalPointer.pos;
 }
 
 void SeatInterface::setPointerPos(const QPointF &pos)
 {
     Q_D();
-    if (d->pointerPos == pos) {
+    if (d->globalPointer.pos == pos) {
         return;
     }
-    d->pointerPos = pos;
+    d->globalPointer.pos = pos;
     emit pointerPosChanged(pos);
 }