Move the createDefaultSurface function to QWaylandCompositorPrivate

Its really not meant to be reimplemented by other classes than
QWaylandCompositor or QWaylandQuickCompositor because of the
createSurface signal. If someone really wants to use the virtual
function then they can subclass the private

Change-Id: Iad88fde3fc999ac18bdc57bd37864884865a962a
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>

1 files changed, 16 insertions, 6 deletions

diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.cpp b/src/compositor/compositor_api/qwaylandquickcompositor.cpp
index 8ebd1b6f6..70afccb93 100644
--- a/src/compositor/compositor_api/qwaylandquickcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandquickcompositor.cpp
@@ -43,11 +43,26 @@
 #include "qwaylandquickoutput.h"
 #include "qwaylandquickitem.h"
 #include "qwaylandoutput.h"
+#include <QtCompositor/private/qwaylandcompositor_p.h>
 
 QT_BEGIN_NAMESPACE
 
+class QWaylandQuickCompositorPrivate : public QWaylandCompositorPrivate
+{
+public:
+    QWaylandQuickCompositorPrivate(QWaylandCompositor *compositor)
+        : QWaylandCompositorPrivate(compositor)
+    {
+    }
+protected:
+    QWaylandSurface *createDefaultSurface() Q_DECL_OVERRIDE
+    {
+        return new QWaylandQuickSurface();
+    }
+};
+
 QWaylandQuickCompositor::QWaylandQuickCompositor(QObject *parent)
-    : QWaylandCompositor(parent)
+    : QWaylandCompositor(*new QWaylandQuickCompositorPrivate(this), parent)
 {
 }
 
@@ -57,11 +72,6 @@ void QWaylandQuickCompositor::create()
 }
 
 
-QWaylandSurface *QWaylandQuickCompositor::createDefaultSurfaceType()
-{
-    return new QWaylandQuickSurface();
-}
-
 void QWaylandQuickCompositor::classBegin()
 {
 }