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 /examples | |
| parent | 1b9e6e56269a5768cb8a83dc5e4b888fd63dd13c (diff) | |
| download | qtwayland-674c6eef06ae23abadab7969125834617a7be562.tar.gz | |
Remove QtWayland::Compositor and add QWaylandCompositorPrivate
Embrace PIMPL
Change-Id: I8c8b5971e15c208317ff33231bda1513e7b8d489
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/wayland/server-buffer/compositor/main.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/examples/wayland/server-buffer/compositor/main.cpp b/examples/wayland/server-buffer/compositor/main.cpp index edae5b06..1984cb0c 100644 --- a/examples/wayland/server-buffer/compositor/main.cpp +++ b/examples/wayland/server-buffer/compositor/main.cpp @@ -57,7 +57,8 @@ #include "qwayland-server-share-buffer.h" #include <QtCompositor/qwaylandoutput.h> -#include <QtCompositor/private/qwlcompositor_p.h> +#include <QtCompositor/QWaylandCompositor> +#include <QtCompositor/private/qwaylandcompositor_p.h> #include <QtCompositor/private/qwlserverbufferintegration_p.h> #include "serverbufferitem.h" @@ -73,7 +74,7 @@ class QmlCompositor public: QmlCompositor() : QWaylandQuickCompositor() - , QtWaylandServer::qt_share_buffer(QWaylandCompositor::handle()->wl_display(), 1) + , QtWaylandServer::qt_share_buffer(QWaylandCompositor::display(), 1) , m_server_buffer_32_bit(0) , m_server_buffer_item_32_bit(0) , m_server_buffer_8_bit(0) @@ -138,12 +139,12 @@ private slots: void initiateServerBuffer() { - if (!QWaylandCompositor::handle()->serverBufferIntegration()) + if (!QWaylandCompositorPrivate::get(this)->serverBufferIntegration()) return; m_view.openglContext()->makeCurrent(&m_view); - QtWayland::ServerBufferIntegration *sbi = QWaylandCompositor::handle()->serverBufferIntegration(); + QtWayland::ServerBufferIntegration *sbi = QWaylandCompositorPrivate::get(this)->serverBufferIntegration(); if (!sbi) { qWarning("Could not find a Server Buffer Integration"); return; |