Make it possible to connect to a createSurface signal

Remove the QWaylandSurface factory function from QWaylandCompositor.
Add a default constructor to QWaylandSurface and a initialize function.
Add som housekeeping code in debug builds that ensures the user calls
initialize.
Add a fallback factory function on the compositor if the user is fine
with getting the default implementation of QWaylandSurface or
QWaylandQuickSurface

Change-Id: Ib9289c323b6723f0d1119a484cf9e0c26c95b549

1 files changed, 10 insertions, 6 deletions

diff --git a/src/compositor/compositor_api/qwaylandquicksurface.cpp b/src/compositor/compositor_api/qwaylandquicksurface.cpp
index 77f16887f..10e1ed5b2 100644
--- a/src/compositor/compositor_api/qwaylandquicksurface.cpp
+++ b/src/compositor/compositor_api/qwaylandquicksurface.cpp
@@ -55,9 +55,8 @@ class QWaylandQuickSurfacePrivate : public QWaylandSurfacePrivate
 {
     Q_DECLARE_PUBLIC(QWaylandQuickSurface)
 public:
-    QWaylandQuickSurfacePrivate(QWaylandClient *client, quint32 id, int version, QWaylandQuickCompositor *c)
-        : QWaylandSurfacePrivate(client, id, version, c)
-        , compositor(c)
+    QWaylandQuickSurfacePrivate()
+        : QWaylandSurfacePrivate()
         , useTextureAlpha(true)
         , clientRenderingEnabled(true)
     {
@@ -67,14 +66,19 @@ public:
     {
     }
 
-    QWaylandQuickCompositor *compositor;
     bool useTextureAlpha;
     bool clientRenderingEnabled;
 };
 
-QWaylandQuickSurface::QWaylandQuickSurface(QWaylandClient *client, quint32 id, int version, QWaylandQuickCompositor *compositor)
-                    : QWaylandSurface(new QWaylandQuickSurfacePrivate(client, id, version, compositor))
+QWaylandQuickSurface::QWaylandQuickSurface()
+    : QWaylandSurface(* new QWaylandQuickSurfacePrivate())
 {
+
+}
+QWaylandQuickSurface::QWaylandQuickSurface(QWaylandCompositor *compositor, QWaylandClient *client, quint32 id, int version)
+                    : QWaylandSurface(* new QWaylandQuickSurfacePrivate())
+{
+    initialize(compositor, client, id, version);
 }
 
 QWaylandQuickSurface::~QWaylandQuickSurface()