diff options
Diffstat (limited to 'src/compositor/compositor_api/qwaylandcompositor.cpp')
-rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.cpp | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index 0a2b28714..6ccc8ee09 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -260,7 +260,7 @@ void QWaylandCompositorPrivate::compositor_create_surface(Resource *resource, ui if (surfResource) { surface = QWaylandSurface::fromResource(surfResource); } else { - surface = q->createDefaultSurfaceType(); + surface = createDefaultSurface(); surface->initialize(q, client, id, resource->version()); } Q_ASSERT(surface); @@ -273,6 +273,16 @@ void QWaylandCompositorPrivate::compositor_create_region(Resource *resource, uin new QtWayland::Region(resource->client(), id); } +/*! + \internal + Used to create a fallback QWaylandSurface when no surface was + created by emitting the QWaylandCompositor::createSurface signal. +*/ +QWaylandSurface *QWaylandCompositorPrivate::createDefaultSurface() +{ + return new QWaylandSurface(); +} + void QWaylandCompositorPrivate::initializeHardwareIntegration() { @@ -348,6 +358,11 @@ QWaylandCompositor::QWaylandCompositor(QObject *parent) { } +QWaylandCompositor::QWaylandCompositor(QWaylandCompositorPrivate &dptr, QObject *parent) + : QObject(dptr, parent) +{ +} + QWaylandCompositor::~QWaylandCompositor() { } @@ -507,16 +522,6 @@ void QWaylandCompositor::processWaylandEvents() } -/*! - \internal - Used to create a fallback QWaylandSurface when no surface was - created by emitting the QWaylandCompositor::createSurface signal. -*/ -QWaylandSurface *QWaylandCompositor::createDefaultSurfaceType() -{ - return new QWaylandSurface(); -} - QWaylandInputDevice *QWaylandCompositor::createInputDevice() { return new QWaylandInputDevice(this); |