diff options
author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-12 16:43:29 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:10:33 +0200 |
commit | 3b2206d8495286ad3427edc7ec99b1d5efb2f370 (patch) | |
tree | eab1d83d04363ad31aedebc53ef2f96044acc427 /src/compositor/compositor_api/qwaylandsurface.cpp | |
parent | 674c6eef06ae23abadab7969125834617a7be562 (diff) |
Use QWaylandClient in constructor of QWaylandSurface
instead of struct ::wl_client *
Change-Id: I606a813e84eeec8134e6ece428f42a53e1ba0189
Diffstat (limited to 'src/compositor/compositor_api/qwaylandsurface.cpp')
-rw-r--r-- | src/compositor/compositor_api/qwaylandsurface.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp index cf0a7cd85..6bd4caef4 100644 --- a/src/compositor/compositor_api/qwaylandsurface.cpp +++ b/src/compositor/compositor_api/qwaylandsurface.cpp @@ -113,11 +113,11 @@ static QRegion infiniteRegion() { QPoint(std::numeric_limits<int>::max(), std::numeric_limits<int>::max()))); } -QWaylandSurfacePrivate::QWaylandSurfacePrivate(wl_client *client, quint32 id, int version, QWaylandCompositor *compositor) - : QtWaylandServer::wl_surface(client, id, version) +QWaylandSurfacePrivate::QWaylandSurfacePrivate(QWaylandClient *client, quint32 id, int version, QWaylandCompositor *compositor) + : QtWaylandServer::wl_surface(client->client(), id, version) , m_compositor(compositor) , refCount(1) - , client(QWaylandClient::fromWlClient(compositor, client)) + , client(client) , m_buffer(0) , m_inputPanelSurface(0) , m_inputRegion(infiniteRegion()) @@ -339,7 +339,7 @@ QtWayland::SurfaceBuffer *QWaylandSurfacePrivate::createSurfaceBuffer(struct ::w return newBuffer; } -QWaylandSurface::QWaylandSurface(wl_client *client, quint32 id, int version, QWaylandCompositor *compositor) +QWaylandSurface::QWaylandSurface(QWaylandClient *client, quint32 id, int version, QWaylandCompositor *compositor) : QObject(*new QWaylandSurfacePrivate(client, id, version, compositor)) { } |