diff options
author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-07-31 10:25:12 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:10:32 +0200 |
commit | b4f037cff4fc8ece612d8dca034ba784d86b816f (patch) | |
tree | 8f29d668534df0fb8c72b4e69f019fbb27f40957 /src/compositor/compositor_api/qwaylandsurface.cpp | |
parent | 760471c5404509aa02df4a39f89eb24199d58a7c (diff) |
Remove excess definition of QWaylandKeymap
Also remove QWaylandUnmapLock
Change-Id: I0b481224fd03032603084142f36be279351f6611
Diffstat (limited to 'src/compositor/compositor_api/qwaylandsurface.cpp')
-rw-r--r-- | src/compositor/compositor_api/qwaylandsurface.cpp | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp index 6b1290acd..6fcf6ea56 100644 --- a/src/compositor/compositor_api/qwaylandsurface.cpp +++ b/src/compositor/compositor_api/qwaylandsurface.cpp @@ -67,7 +67,6 @@ QWaylandSurfacePrivate::QWaylandSurfacePrivate(wl_client *wlClient, quint32 id, : QtWayland::Surface(wlClient, id, version, compositor, surface) , closing(false) , refCount(1) - , client(QWaylandClient::fromWlClient(wlClient)) , client(QWaylandClient::fromWlClient(compositor, wlClient)) {} @@ -397,30 +396,4 @@ void QWaylandSurfacePrivate::derefView(QWaylandView *view) } } -class QWaylandUnmapLockPrivate -{ -public: - QWaylandSurface *surface; -}; - -/*! - Constructs a QWaylandUnmapLock object. - - The lock will act on the \a surface parameter, and will prevent the surface to - be unmapped, retaining the last valid buffer when the client attachs a NULL buffer. - The lock will be automatically released when deleted. -*/ -QWaylandUnmapLock::QWaylandUnmapLock(QWaylandSurface *surface) - : d(new QWaylandUnmapLockPrivate) -{ - d->surface = surface; - surface->handle()->addUnmapLock(this); -} - -QWaylandUnmapLock::~QWaylandUnmapLock() -{ - d->surface->handle()->removeUnmapLock(this); - delete d; -} - QT_END_NAMESPACE |