diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-12 15:39:39 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:10:33 +0200 |
| commit | 674c6eef06ae23abadab7969125834617a7be562 (patch) | |
| tree | 88d4c1039dc25905241721416352286875a24c7c /src/compositor/compositor_api/qwaylandsurface.cpp | |
| parent | 1b9e6e56269a5768cb8a83dc5e4b888fd63dd13c (diff) | |
Remove QtWayland::Compositor and add QWaylandCompositorPrivate
Embrace PIMPL
Change-Id: I8c8b5971e15c208317ff33231bda1513e7b8d489
Diffstat (limited to 'src/compositor/compositor_api/qwaylandsurface.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandsurface.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp index fdacee958..cf0a7cd85 100644 --- a/src/compositor/compositor_api/qwaylandsurface.cpp +++ b/src/compositor/compositor_api/qwaylandsurface.cpp @@ -40,7 +40,6 @@ #include <private/qobject_p.h> -#include "wayland_wrapper/qwlcompositor_p.h" #include "wayland_wrapper/qwlinputdevice_p.h" #include "wayland_wrapper/qwldatadevice_p.h" #include "wayland_wrapper/qwldatadevicemanager_p.h" @@ -49,10 +48,13 @@ #include "extensions/qwlextendedsurface_p.h" #include "extensions/qwlsubsurface_p.h" -#include "qwaylandcompositor.h" -#include "qwaylandclient.h" -#include "qwaylandview_p.h" -#include "qwaylandbufferref.h" +#include <QtCompositor/QWaylandCompositor> +#include <QtCompositor/QWaylandClient> +#include <QtCompositor/QWaylandView> +#include <QtCompositor/QWaylandBufferRef> + +#include <QtCompositor/private/qwaylandcompositor_p.h> +#include <QtCompositor/private/qwaylandview_p.h> #include <QtGui/QGuiApplication> #include <QtGui/QScreen> @@ -350,7 +352,7 @@ QWaylandSurface::QWaylandSurface(QWaylandSurfacePrivate *dptr) QWaylandSurface::~QWaylandSurface() { Q_D(QWaylandSurface); - d->m_compositor->handle()->unregisterSurface(this); + QWaylandCompositorPrivate::get(d->m_compositor)->unregisterSurface(this); d->notifyViewsAboutDestruction(); } @@ -447,7 +449,7 @@ void QWaylandSurface::updateSelection() if (inputDevice) { const QtWayland::DataDevice *dataDevice = QWaylandInputDevicePrivate::get(inputDevice)->dataDevice(); if (dataDevice) { - d->compositor()->handle()->dataDeviceManager()->offerRetainedSelection( + QWaylandCompositorPrivate::get(d->compositor())->dataDeviceManager()->offerRetainedSelection( dataDevice->resourceMap().value(d->resource()->client())->handle); } } @@ -463,7 +465,7 @@ void QWaylandSurface::deref() { Q_D(QWaylandSurface); if (--d->refCount == 0) - compositor()->handle()->destroySurface(this); + QWaylandCompositorPrivate::get(compositor())->destroySurface(this); } QWaylandView *QWaylandSurface::throttlingView() const |