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/wayland_wrapper/qwlinputdevice.cpp | |
parent | 1b9e6e56269a5768cb8a83dc5e4b888fd63dd13c (diff) | |
download | qtwayland-674c6eef06ae23abadab7969125834617a7be562.tar.gz |
Remove QtWayland::Compositor and add QWaylandCompositorPrivate
Embrace PIMPL
Change-Id: I8c8b5971e15c208317ff33231bda1513e7b8d489
Diffstat (limited to 'src/compositor/wayland_wrapper/qwlinputdevice.cpp')
-rw-r--r-- | src/compositor/wayland_wrapper/qwlinputdevice.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/compositor/wayland_wrapper/qwlinputdevice.cpp b/src/compositor/wayland_wrapper/qwlinputdevice.cpp index 2849a237..12c38bf8 100644 --- a/src/compositor/wayland_wrapper/qwlinputdevice.cpp +++ b/src/compositor/wayland_wrapper/qwlinputdevice.cpp @@ -36,12 +36,12 @@ #include "qwlinputdevice_p.h" -#include "qwlcompositor_p.h" +#include <QtCompositor/QWaylandCompositor> +#include <QtCompositor/private/qwaylandcompositor_p.h> #include "qwldatadevice_p.h" #include "qwlinputmethod_p.h" #include "qwlqttouch_p.h" #include "qwlqtkey_p.h" -#include "qwaylandcompositor.h" #include "qwaylanddrag.h" #include "qwlpointer_p.h" #include "qwlkeyboard_p.h" @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE QWaylandInputDevicePrivate::QWaylandInputDevicePrivate(QWaylandInputDevice *inputdevice, QWaylandCompositor *compositor) : QObjectPrivate() - , QtWaylandServer::wl_seat(compositor->waylandDisplay(), 3) + , QtWaylandServer::wl_seat(compositor->display(), 3) , m_dragHandle(new QWaylandDrag(inputdevice)) , m_compositor(compositor) , m_outputSpace(compositor->primaryOutputSpace()) @@ -109,15 +109,15 @@ void QWaylandInputDevicePrivate::setCapabilities(QWaylandInputDevice::Capability QWaylandInputDevice::CapabilityFlags changed = caps ^ m_capabilities; if (changed & QWaylandInputDevice::Pointer) { - m_pointer.reset(m_pointer.isNull() ? compositor()->handle()->callCreatePointerDevice(q) : 0); + m_pointer.reset(m_pointer.isNull() ? QWaylandCompositorPrivate::get(compositor())->callCreatePointerDevice(q) : 0); } if (changed & QWaylandInputDevice::Keyboard) { - m_keyboard.reset(m_keyboard.isNull() ? compositor()->handle()->callCreateKeyboardDevice(q) : 0); + m_keyboard.reset(m_keyboard.isNull() ? QWaylandCompositorPrivate::get(compositor())->callCreateKeyboardDevice(q) : 0); } if (changed & QWaylandInputDevice::Touch) { - m_touch.reset(m_touch.isNull() ? compositor()->handle()->callCreateTouchDevice(q) : 0); + m_touch.reset(m_touch.isNull() ? QWaylandCompositorPrivate::get(compositor())->callCreateTouchDevice(q) : 0); } m_capabilities = caps; |