From 762d384b806deb84072a5c7eb6b91afa1e150c1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Mon, 7 Sep 2015 11:08:29 +0200 Subject: Move the createDefaultSurface function to QWaylandCompositorPrivate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/compositor/compositor_api/qwaylandcompositor.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/compositor/compositor_api/qwaylandcompositor.h') diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h index d859ab341..f986c6444 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.h +++ b/src/compositor/compositor_api/qwaylandcompositor.h @@ -148,10 +148,7 @@ protected: virtual QWaylandKeyboard *createKeyboardDevice(QWaylandInputDevice *inputDevice); virtual QWaylandTouch *createTouchDevice(QWaylandInputDevice *inputDevice); - QWaylandCompositor(QWaylandCompositorPrivate *dptr); - -private: - virtual QWaylandSurface *createDefaultSurfaceType(); + QWaylandCompositor(QWaylandCompositorPrivate &dptr, QObject *parent = 0); }; QT_END_NAMESPACE -- cgit v1.2.3