summaryrefslogtreecommitdiffstats
path: root/src/compositor/compositor_api/qwaylandclient.cpp
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@theqtcompany.com>2015-08-12 15:39:39 +0200
committerJørgen Lind <jorgen.lind@theqtcompany.com>2015-08-28 13:10:33 +0200
commit674c6eef06ae23abadab7969125834617a7be562 (patch)
tree88d4c1039dc25905241721416352286875a24c7c /src/compositor/compositor_api/qwaylandclient.cpp
parent1b9e6e56269a5768cb8a83dc5e4b888fd63dd13c (diff)
Remove QtWayland::Compositor and add QWaylandCompositorPrivate
Diffstat (limited to 'src/compositor/compositor_api/qwaylandclient.cpp')
-rw-r--r--src/compositor/compositor_api/qwaylandclient.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/compositor/compositor_api/qwaylandclient.cpp b/src/compositor/compositor_api/qwaylandclient.cpp
index 1b3db5858..df5cf7d27 100644
--- a/src/compositor/compositor_api/qwaylandclient.cpp
+++ b/src/compositor/compositor_api/qwaylandclient.cpp
@@ -34,11 +34,12 @@
**
****************************************************************************/
-#include <private/qobject_p.h>
-
-#include "wayland_wrapper/qwlcompositor_p.h"
-#include "qwaylandcompositor.h"
#include "qwaylandclient.h"
+#include <QtCore/private/qobject_p.h>
+
+#include <QtCompositor/QWaylandCompositor>
+#include <QtCompositor/private/qwaylandcompositor_p.h>
+
#include <wayland-server.h>
#include <wayland-util.h>
@@ -93,7 +94,7 @@ QWaylandClient::QWaylandClient(QWaylandCompositor *compositor, wl_client *client
d->listener.listener.notify = QWaylandClientPrivate::client_destroy_callback;
wl_client_add_destroy_listener(client, &d->listener.listener);
- compositor->handle()->m_clients.append(this);
+ QWaylandCompositorPrivate::get(compositor)->addClient(this);
}
QWaylandClient::~QWaylandClient()
@@ -103,7 +104,7 @@ QWaylandClient::~QWaylandClient()
// Remove listener from signal
wl_list_remove(&d->listener.listener.link);
- d->compositor->handle()->m_clients.removeOne(this);
+ QWaylandCompositorPrivate::get(d->compositor)->removeClient(this);
}
QWaylandClient *QWaylandClient::fromWlClient(QWaylandCompositor *compositor, wl_client *wlClient)