Avoid exposing dependencies from libinput support

Do not include other headers from the main qlibinputhandler_p.h that
serves as the external interface to the generic plugin for example.
This way the clients do not need to care about xkbcommon headers and
such.

Task-number: QTBUG-43498
Change-Id: I56335cb19200fee830bdf4b1d203904f741f7489
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>

1 files changed, 8 insertions, 7 deletions

diff --git a/src/platformsupport/input/libinput/qlibinputhandler_p.h b/src/platformsupport/input/libinput/qlibinputhandler_p.h
index b6c88111af..a1cfaca3ce 100644
--- a/src/platformsupport/input/libinput/qlibinputhandler_p.h
+++ b/src/platformsupport/input/libinput/qlibinputhandler_p.h
@@ -35,9 +35,7 @@
 #define QLIBINPUTHANDLER_P_H
 
 #include <QtCore/QObject>
-#include "qlibinputpointer_p.h"
-#include "qlibinputkeyboard_p.h"
-#include "qlibinputtouch_p.h"
+#include <QtCore/QScopedPointer>
 
 //
 //  W A R N I N G
@@ -57,6 +55,9 @@ struct libinput_event;
 QT_BEGIN_NAMESPACE
 
 class QSocketNotifier;
+class QLibInputPointer;
+class QLibInputKeyboard;
+class QLibInputTouch;
 
 class QLibInputHandler : public QObject
 {
@@ -79,10 +80,10 @@ private:
     udev *m_udev;
     libinput *m_li;
     int m_liFd;
-    QSocketNotifier *m_notifier;
-    QLibInputPointer m_pointer;
-    QLibInputKeyboard m_keyboard;
-    QLibInputTouch m_touch;
+    QScopedPointer<QSocketNotifier> m_notifier;
+    QScopedPointer<QLibInputPointer> m_pointer;
+    QScopedPointer<QLibInputKeyboard> m_keyboard;
+    QScopedPointer<QLibInputTouch> m_touch;
 };
 
 QT_END_NAMESPACE