Remove QtWayland::Compositor and add QWaylandCompositorPrivate

Embrace PIMPL

Change-Id: I8c8b5971e15c208317ff33231bda1513e7b8d489

3 files changed, 7 insertions, 7 deletions

diff --git a/src/compositor/hardware_integration/qwlclientbufferintegration_p.h b/src/compositor/hardware_integration/qwlclientbufferintegration_p.h
index 9d684553a..b7614fd72 100644
--- a/src/compositor/hardware_integration/qwlclientbufferintegration_p.h
+++ b/src/compositor/hardware_integration/qwlclientbufferintegration_p.h
@@ -59,7 +59,7 @@ public:
 
     void setCompositor(QWaylandCompositor *compositor) { m_compositor = compositor; }
 
-    virtual void initializeHardware(QtWayland::Display *waylandDisplay) = 0;
+    virtual void initializeHardware(struct ::wl_display *display) = 0;
 
     // Used when the hardware integration wants to provide its own texture for a given buffer.
     // In most cases the compositor creates and manages the texture so this is not needed.
diff --git a/src/compositor/hardware_integration/qwlhwintegration.cpp b/src/compositor/hardware_integration/qwlhwintegration.cpp
index f9d0377e7..68ab0d890 100644
--- a/src/compositor/hardware_integration/qwlhwintegration.cpp
+++ b/src/compositor/hardware_integration/qwlhwintegration.cpp
@@ -36,14 +36,14 @@
 
 #include "qwlhwintegration_p.h"
 
-#include "qwlcompositor_p.h"
+#include <QtCompositor/QWaylandCompositor>
 
 QT_BEGIN_NAMESPACE
 
 namespace QtWayland {
 
-HardwareIntegration::HardwareIntegration(Compositor *compositor)
-    : qt_hardware_integration(compositor->wl_display(), 1)
+HardwareIntegration::HardwareIntegration(QWaylandCompositor *compositor)
+    : qt_hardware_integration(compositor->display(), 1)
 {
 }
 void HardwareIntegration::setClientBufferIntegration(const QString &name)
diff --git a/src/compositor/hardware_integration/qwlhwintegration_p.h b/src/compositor/hardware_integration/qwlhwintegration_p.h
index f615aa7f0..42c6e685a 100644
--- a/src/compositor/hardware_integration/qwlhwintegration_p.h
+++ b/src/compositor/hardware_integration/qwlhwintegration_p.h
@@ -43,14 +43,14 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace QtWayland {
+class QWaylandCompositor;
 
-class Compositor;
+namespace QtWayland {
 
 class HardwareIntegration : public QtWaylandServer::qt_hardware_integration
 {
 public:
-    HardwareIntegration(Compositor *compositor);
+    HardwareIntegration(QWaylandCompositor *compositor);
 
     void setClientBufferIntegration(const QString &name);
     void setServerBufferIntegration(const QString &name);