Remove QtWayland::Compositor and add QWaylandCompositorPrivate

Embrace PIMPL

Change-Id: I8c8b5971e15c208317ff33231bda1513e7b8d489

15 files changed, 50 insertions, 51 deletions

diff --git a/src/compositor/extensions/qwaylandwindowmanagerextension.cpp b/src/compositor/extensions/qwaylandwindowmanagerextension.cpp
index 80ccd02e..64aff1de 100644
--- a/src/compositor/extensions/qwaylandwindowmanagerextension.cpp
+++ b/src/compositor/extensions/qwaylandwindowmanagerextension.cpp
@@ -54,7 +54,7 @@ QWaylandWindowManagerExtensionPrivate::QWaylandWindowManagerExtensionPrivate(QWa
     , m_showIsFullScreen(false)
     , m_compositor(compositor)
 {
-    init(compositor->waylandDisplay(), 1);
+    init(compositor->display(), 1);
 }
 
 void QWaylandWindowManagerExtension::setShowIsFullScreen(bool value)
diff --git a/src/compositor/extensions/qwlextendedsurface.cpp b/src/compositor/extensions/qwlextendedsurface.cpp
index 21292c14..51b49d25 100644
--- a/src/compositor/extensions/qwlextendedsurface.cpp
+++ b/src/compositor/extensions/qwlextendedsurface.cpp
@@ -36,15 +36,15 @@
 
 #include "qwlextendedsurface_p.h"
 
-#include "qwlcompositor_p.h"
+#include <QtCompositor/QWaylandCompositor>
 
 QT_BEGIN_NAMESPACE
 
 namespace QtWayland {
 
-SurfaceExtensionGlobal::SurfaceExtensionGlobal(Compositor *compositor)
-    : QWaylandExtensionTemplate(compositor->waylandCompositor())
-    , QtWaylandServer::qt_surface_extension(compositor->wl_display(), 1)
+SurfaceExtensionGlobal::SurfaceExtensionGlobal(QWaylandCompositor *compositor)
+    : QWaylandExtensionTemplate(compositor)
+    , QtWaylandServer::qt_surface_extension(compositor->display(), 1)
 {
 }
 
diff --git a/src/compositor/extensions/qwlextendedsurface_p.h b/src/compositor/extensions/qwlextendedsurface_p.h
index 052ecf5e..0153303f 100644
--- a/src/compositor/extensions/qwlextendedsurface_p.h
+++ b/src/compositor/extensions/qwlextendedsurface_p.h
@@ -49,16 +49,15 @@
 
 QT_BEGIN_NAMESPACE
 
+class QWaylandCompositor;
 class QWaylandSurface;
 
 namespace QtWayland {
 
-class Compositor;
-
 class SurfaceExtensionGlobal : public QWaylandExtensionTemplate<SurfaceExtensionGlobal>, public QtWaylandServer::qt_surface_extension
 {
 public:
-    SurfaceExtensionGlobal(Compositor *compositor);
+    SurfaceExtensionGlobal(QWaylandCompositor *compositor);
 
 private:
     void surface_extension_get_extended_surface(Resource *resource,
diff --git a/src/compositor/extensions/qwlinputpanel.cpp b/src/compositor/extensions/qwlinputpanel.cpp
index cc4836bc..2aaffae3 100644
--- a/src/compositor/extensions/qwlinputpanel.cpp
+++ b/src/compositor/extensions/qwlinputpanel.cpp
@@ -37,8 +37,8 @@
 #include "qwlinputpanel_p.h"
 
 #include <QtCompositor/qwaylandinputpanel.h>
+#include <QtCompositor/QWaylandCompositor>
 
-#include "qwlcompositor_p.h"
 #include "qwlinputdevice_p.h"
 #include "qwlinputmethod_p.h"
 #include "qwlinputpanelsurface_p.h"
@@ -46,15 +46,15 @@
 
 QT_BEGIN_NAMESPACE
 
-QWaylandInputPanelPrivate::QWaylandInputPanelPrivate(QtWayland::Compositor *compositor)
-    : QWaylandExtensionTemplatePrivate(compositor->waylandCompositor())
+QWaylandInputPanelPrivate::QWaylandInputPanelPrivate(QWaylandCompositor *compositor)
+    : QWaylandExtensionTemplatePrivate(compositor)
     , QtWaylandServer::wl_input_panel()
     , m_compositor(compositor)
     , m_focus()
     , m_inputPanelVisible(false)
     , m_cursorRectangle()
 {
-    init(compositor->wl_display(), 1);
+    init(compositor->display(), 1);
 }
 
 QWaylandInputPanelPrivate::~QWaylandInputPanelPrivate()
diff --git a/src/compositor/extensions/qwlinputpanel_p.h b/src/compositor/extensions/qwlinputpanel_p.h
index 65718892..1cb6f383 100644
--- a/src/compositor/extensions/qwlinputpanel_p.h
+++ b/src/compositor/extensions/qwlinputpanel_p.h
@@ -49,7 +49,6 @@
 QT_BEGIN_NAMESPACE
 
 namespace QtWayland {
-class Compositor;
 class TextInput;
 }
 
@@ -58,7 +57,7 @@ class Q_COMPOSITOR_EXPORT QWaylandInputPanelPrivate : public QWaylandExtensionTe
 {
     Q_DECLARE_PUBLIC(QWaylandInputPanel)
 public:
-    QWaylandInputPanelPrivate(QtWayland::Compositor *compositor);
+    QWaylandInputPanelPrivate(QWaylandCompositor *compositor);
     ~QWaylandInputPanelPrivate();
 
     QWaylandInputPanel *waylandInputPanel() const;
@@ -77,7 +76,7 @@ protected:
     void input_panel_get_input_panel_surface(Resource *resource, uint32_t id, struct ::wl_resource *surface) Q_DECL_OVERRIDE;
 
 private:
-    QtWayland::Compositor *m_compositor;
+    QWaylandCompositor *m_compositor;
 
     QWaylandSurface *m_focus;
     bool m_inputPanelVisible;
diff --git a/src/compositor/extensions/qwlqtkey.cpp b/src/compositor/extensions/qwlqtkey.cpp
index 875524bf..90bb83b3 100644
--- a/src/compositor/extensions/qwlqtkey.cpp
+++ b/src/compositor/extensions/qwlqtkey.cpp
@@ -43,9 +43,9 @@ QT_BEGIN_NAMESPACE
 
 namespace QtWayland {
 
-QtKeyExtensionGlobal::QtKeyExtensionGlobal(Compositor *compositor)
-    : QWaylandExtensionTemplate(compositor->waylandCompositor())
-    , QtWaylandServer::qt_key_extension(compositor->wl_display(), 2)
+QtKeyExtensionGlobal::QtKeyExtensionGlobal(QWaylandCompositor *compositor)
+    : QWaylandExtensionTemplate(compositor)
+    , QtWaylandServer::qt_key_extension(compositor->display(), 2)
     , m_compositor(compositor)
 {
 }
diff --git a/src/compositor/extensions/qwlqtkey_p.h b/src/compositor/extensions/qwlqtkey_p.h
index 67474ffc..decb1975 100644
--- a/src/compositor/extensions/qwlqtkey_p.h
+++ b/src/compositor/extensions/qwlqtkey_p.h
@@ -37,16 +37,15 @@
 #ifndef WLQTKEY_H
 #define WLQTKEY_H
 
-#include  <private/qwlcompositor_p.h>
-
 #include "wayland-util.h"
 
+#include <QtCompositor/QWaylandExtensionTemplate>
+#include <QtCompositor/QWaylandCompositor>
 #include <QtCompositor/private/qwayland-server-qtkey-extension.h>
 
 QT_BEGIN_NAMESPACE
 
 class QWaylandSurface;
-class Compositor;
 class QKeyEvent;
 
 namespace QtWayland {
@@ -55,12 +54,12 @@ class QtKeyExtensionGlobal : public QWaylandExtensionTemplate<QtKeyExtensionGlob
 {
     Q_OBJECT
 public:
-    QtKeyExtensionGlobal(Compositor *compositor);
+    QtKeyExtensionGlobal(QWaylandCompositor *compositor);
 
     bool postQtKeyEvent(QKeyEvent *event, QWaylandSurface *surface);
 
 private:
-    Compositor *m_compositor;
+    QWaylandCompositor *m_compositor;
 };
 
 }
diff --git a/src/compositor/extensions/qwlqttouch.cpp b/src/compositor/extensions/qwlqttouch.cpp
index 9c476dbf..5f0c60b9 100644
--- a/src/compositor/extensions/qwlqttouch.cpp
+++ b/src/compositor/extensions/qwlqttouch.cpp
@@ -45,9 +45,9 @@ namespace QtWayland {
 
 static const int maxRawPos = 24;
 
-TouchExtensionGlobal::TouchExtensionGlobal(Compositor *compositor)
-    : QWaylandExtensionTemplate(compositor->waylandCompositor())
-    , QtWaylandServer::qt_touch_extension(compositor->wl_display(), 1)
+TouchExtensionGlobal::TouchExtensionGlobal(QWaylandCompositor *compositor)
+    : QWaylandExtensionTemplate(compositor)
+    , QtWaylandServer::qt_touch_extension(compositor->display(), 1)
     , m_compositor(compositor)
     , m_flags(0)
     , m_resources()
diff --git a/src/compositor/extensions/qwlqttouch_p.h b/src/compositor/extensions/qwlqttouch_p.h
index e7860343..46afebfa 100644
--- a/src/compositor/extensions/qwlqttouch_p.h
+++ b/src/compositor/extensions/qwlqttouch_p.h
@@ -37,13 +37,13 @@
 #ifndef WLTOUCH_H
 #define WLTOUCH_H
 
-#include <private/qwlcompositor_p.h>
 #include <QtCompositor/private/qwayland-server-touch-extension.h>
+#include <QtCompositor/QWaylandCompositor>
+#include <QtCompositor/QWaylandExtensionTemplate>
 #include "wayland-util.h"
 
 QT_BEGIN_NAMESPACE
 
-class Compositor;
 class Surface;
 class QTouchEvent;
 class QWaylandView;
@@ -62,7 +62,7 @@ public:
     };
     Q_DECLARE_FLAGS(BehaviorFlags, BehaviorFlag)
 
-    TouchExtensionGlobal(Compositor *compositor);
+    TouchExtensionGlobal(QWaylandCompositor *compositor);
     ~TouchExtensionGlobal();
 
     bool postTouchEvent(QTouchEvent *event, QWaylandView *view);
@@ -78,7 +78,7 @@ protected:
     void touch_extension_destroy_resource(Resource *resource) Q_DECL_OVERRIDE;
 
 private:
-    Compositor *m_compositor;
+    QWaylandCompositor *m_compositor;
     BehaviorFlags m_flags;
     QList<Resource *> m_resources;
     QVector<float> m_posData;
diff --git a/src/compositor/extensions/qwlshellsurface.cpp b/src/compositor/extensions/qwlshellsurface.cpp
index 3e0535ca..fff4e888 100644
--- a/src/compositor/extensions/qwlshellsurface.cpp
+++ b/src/compositor/extensions/qwlshellsurface.cpp
@@ -37,7 +37,8 @@
 
 #include "qwlshellsurface_p.h"
 
-#include "qwlcompositor_p.h"
+#include <QtCompositor/QWaylandCompositor>
+
 #include "qwloutput_p.h"
 #include "qwlinputdevice_p.h"
 #include "qwlsubsurface_p.h"
@@ -57,7 +58,7 @@ namespace QtWayland {
 
 Shell::Shell(QWaylandCompositor *compositor)
     : QWaylandExtensionTemplate(compositor)
-    , wl_shell(compositor->waylandDisplay(), 1)
+    , wl_shell(compositor->display(), 1)
 {
 }
 
@@ -107,7 +108,7 @@ void ShellSurface::sendConfigure(uint32_t edges, int32_t width, int32_t height)
 
 void ShellSurface::ping()
 {
-    uint32_t serial = wl_display_next_serial(m_surface->compositor()->waylandDisplay());
+    uint32_t serial = m_surface->compositor()->nextSerial();
     ping(serial);
 }
 
diff --git a/src/compositor/extensions/qwlsubsurface.cpp b/src/compositor/extensions/qwlsubsurface.cpp
index 8932748f..91de2614 100644
--- a/src/compositor/extensions/qwlsubsurface.cpp
+++ b/src/compositor/extensions/qwlsubsurface.cpp
@@ -36,7 +36,7 @@
 
 #include "qwlsubsurface_p.h"
 
-#include "qwlcompositor_p.h"
+#include <QtCompositor/QWaylandCompositor>
 #include "qwaylandsurface.h"
 #include "qwaylandview.h"
 
@@ -46,7 +46,7 @@ namespace QtWayland {
 
 SubSurfaceExtensionGlobal::SubSurfaceExtensionGlobal(QWaylandCompositor *compositor)
     : QWaylandExtensionTemplate(compositor)
-    , qt_sub_surface_extension(compositor->waylandDisplay(), 1)
+    , qt_sub_surface_extension(compositor->display(), 1)
     , m_compositor(compositor)
 {
 }
diff --git a/src/compositor/extensions/qwltextinput.cpp b/src/compositor/extensions/qwltextinput.cpp
index 465972d8..d9e1774b 100644
--- a/src/compositor/extensions/qwltextinput.cpp
+++ b/src/compositor/extensions/qwltextinput.cpp
@@ -36,11 +36,12 @@
 
 #include "qwltextinput_p.h"
 
-#include "qwlcompositor_p.h"
 #include "qwlinputdevice_p.h"
 #include "qwlinputmethod_p.h"
 #include "qwlinputmethodcontext_p.h"
 #include "qwlinputpanel_p.h"
+#include <QtCompositor/QWaylandInputPanel>
+#include <QtCompositor/QWaylandCompositor>
 
 #include <algorithm>
 
@@ -48,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
 namespace QtWayland {
 
-TextInput::TextInput(QWaylandExtensionContainer *container, Compositor *compositor, struct ::wl_client *client, int id)
+TextInput::TextInput(QWaylandExtensionContainer *container, QWaylandCompositor *compositor, struct ::wl_client *client, int id)
     : QWaylandExtensionTemplate(container)
     , wl_text_input(client, id, 1)
     , m_compositor(compositor)
@@ -129,7 +130,7 @@ void TextInput::text_input_show_input_panel(Resource *)
     m_inputPanelVisible = true;
 
     if (std::find_if(m_activeInputMethods.cbegin(), m_activeInputMethods.cend(), isInputMethodBound) != m_activeInputMethods.cend()){
-        QWaylandInputPanelPrivate *panel = QWaylandInputPanelPrivate::findIn(m_compositor->waylandCompositor());
+        QWaylandInputPanelPrivate *panel = QWaylandInputPanelPrivate::findIn(m_compositor);
         if (panel)
             panel->setInputPanelVisible(true);
     }
@@ -140,7 +141,7 @@ void TextInput::text_input_hide_input_panel(Resource *)
     m_inputPanelVisible = false;
 
     if (std::find_if(m_activeInputMethods.cbegin(), m_activeInputMethods.cend(), isInputMethodBound) != m_activeInputMethods.cend()) {
-        QWaylandInputPanelPrivate *panel = QWaylandInputPanelPrivate::findIn(m_compositor->waylandCompositor());
+        QWaylandInputPanelPrivate *panel = QWaylandInputPanelPrivate::findIn(m_compositor);
         if (panel)
             panel->setInputPanelVisible(false);
     }
@@ -151,7 +152,7 @@ void TextInput::text_input_set_cursor_rectangle(Resource *, int32_t x, int32_t y
     m_cursorRectangle = QRect(x, y, width, height);
 
     if (!m_activeInputMethods.isEmpty()) {
-        QWaylandInputPanelPrivate *panel = QWaylandInputPanelPrivate::findIn(m_compositor->waylandCompositor());
+        QWaylandInputPanelPrivate *panel = QWaylandInputPanelPrivate::findIn(m_compositor);
         if (panel)
             panel->setCursorRectangle(m_cursorRectangle);
     }
diff --git a/src/compositor/extensions/qwltextinput_p.h b/src/compositor/extensions/qwltextinput_p.h
index bd4b212f..8f51622f 100644
--- a/src/compositor/extensions/qwltextinput_p.h
+++ b/src/compositor/extensions/qwltextinput_p.h
@@ -45,16 +45,16 @@
 QT_BEGIN_NAMESPACE
 
 class QWaylandSurface;
+class QWaylandCompositor;
 
 namespace QtWayland {
 
-class Compositor;
 class InputMethod;
 
 class TextInput : public QWaylandExtensionTemplate<TextInput>, public QtWaylandServer::wl_text_input
 {
 public:
-    explicit TextInput(QWaylandExtensionContainer *container, Compositor *compositor, struct ::wl_client *client, int id);
+    explicit TextInput(QWaylandExtensionContainer *container, QWaylandCompositor *compositor, struct ::wl_client *client, int id);
 
     QWaylandSurface *focus() const;
 
@@ -79,7 +79,7 @@ protected:
     void text_input_invoke_action(Resource *resource, uint32_t button, uint32_t index) Q_DECL_OVERRIDE;
 
 private:
-    Compositor *m_compositor;
+    QWaylandCompositor *m_compositor;
     QList<InputMethod*> m_activeInputMethods;
     QWaylandSurface *m_focus;
 
diff --git a/src/compositor/extensions/qwltextinputmanager.cpp b/src/compositor/extensions/qwltextinputmanager.cpp
index b45a7e38..cbffbf12 100644
--- a/src/compositor/extensions/qwltextinputmanager.cpp
+++ b/src/compositor/extensions/qwltextinputmanager.cpp
@@ -36,16 +36,16 @@
 
 #include "qwltextinputmanager_p.h"
 
-#include "qwlcompositor_p.h"
+#include <QtCompositor/QWaylandCompositor>
 #include "qwltextinput_p.h"
 
 QT_BEGIN_NAMESPACE
 
 namespace QtWayland {
 
-TextInputManager::TextInputManager(Compositor *compositor)
-    : QWaylandExtensionTemplate(compositor->waylandCompositor())
-    , QtWaylandServer::wl_text_input_manager(compositor->wl_display(), 1)
+TextInputManager::TextInputManager(QWaylandCompositor *compositor)
+    : QWaylandExtensionTemplate(compositor)
+    , QtWaylandServer::wl_text_input_manager(compositor->display(), 1)
     , m_compositor(compositor)
 {
 }
diff --git a/src/compositor/extensions/qwltextinputmanager_p.h b/src/compositor/extensions/qwltextinputmanager_p.h
index 234d4ab1..1702166c 100644
--- a/src/compositor/extensions/qwltextinputmanager_p.h
+++ b/src/compositor/extensions/qwltextinputmanager_p.h
@@ -42,22 +42,22 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace QtWayland {
+class QWaylandCompositor;
 
-class Compositor;
+namespace QtWayland {
 
 class TextInputManager : public QWaylandExtensionTemplate<TextInputManager>, public QtWaylandServer::wl_text_input_manager, public QWaylandExtensionContainer
 {
     Q_OBJECT
 public:
-    TextInputManager(Compositor *compositor);
+    TextInputManager(QWaylandCompositor *compositor);
     ~TextInputManager();
 
 protected:
     void text_input_manager_create_text_input(Resource *resource, uint32_t id) Q_DECL_OVERRIDE;
 
 private:
-    Compositor *m_compositor;
+    QWaylandCompositor *m_compositor;
 };
 
 } // namespace QtWayland