diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-16 15:05:00 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-09-18 14:48:15 +0000 |
| commit | 07dffc46ff14a745df020a987c2a17fbfd90d6fe (patch) | |
| tree | 7682c357a9936b1c84826197ed18b7561f460532 /examples | |
| parent | 660880a997a892e7f65d0d7b4e2f974fc4e487ad (diff) | |
Remove the QWaylandOutputSpace
We don't need this abstraction anymore since we don't have global
coordinates in the core api anymore
Change-Id: I553a736a0e71026447d6a0af3f8a64607b8c8f06
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/wayland/qml-compositor/main.cpp | 3 | ||||
| -rw-r--r-- | examples/wayland/qwindow-compositor/windowcompositor.cpp | 5 | ||||
| -rw-r--r-- | examples/wayland/server-buffer/compositor/main.cpp | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/examples/wayland/qml-compositor/main.cpp b/examples/wayland/qml-compositor/main.cpp index b58c4603a..a1eddaf27 100644 --- a/examples/wayland/qml-compositor/main.cpp +++ b/examples/wayland/qml-compositor/main.cpp @@ -44,7 +44,6 @@ #include <QtWaylandCompositor/qwaylandquickitem.h> #include <QtWaylandCompositor/QWaylandQuickOutput> -#include <QtWaylandCompositor/qwaylandoutputspace.h> #include <QGuiApplication> #include <QTimer> @@ -72,7 +71,7 @@ public: setResizeMode(QQuickView::SizeRootObjectToView); setColor(Qt::black); winId(); - m_output = new QWaylandQuickOutput(m_compositor.defaultOutputSpace(), this); + m_output = new QWaylandQuickOutput(&m_compositor, this); connect(this, SIGNAL(afterRendering()), this, SLOT(sendCallbacks())); connect(&m_compositor, &QWaylandCompositor::surfaceCreated, this, &QmlCompositor::onSurfaceCreated); diff --git a/examples/wayland/qwindow-compositor/windowcompositor.cpp b/examples/wayland/qwindow-compositor/windowcompositor.cpp index 951aadf07..25470f8b8 100644 --- a/examples/wayland/qwindow-compositor/windowcompositor.cpp +++ b/examples/wayland/qwindow-compositor/windowcompositor.cpp @@ -44,7 +44,6 @@ #include <QKeyEvent> #include <QTouchEvent> -#include <QtWaylandCompositor/QWaylandOutputSpace> #include <QtWaylandCompositor/QWaylandShellSurface> #include <QtWaylandCompositor/qwaylandinput.h> #include <QtWaylandCompositor/qwaylanddrag.h> @@ -84,7 +83,7 @@ WindowCompositor::~WindowCompositor() void WindowCompositor::create() { QWaylandCompositor::create(); - new QWaylandOutput(defaultOutputSpace(), m_window); + new QWaylandOutput(this, m_window); connect(this, &QWaylandCompositor::surfaceCreated, this, &WindowCompositor::onSurfaceCreated); connect(defaultInputDevice(), &QWaylandInputDevice::cursorSurfaceRequest, this, &WindowCompositor::adjustCursorSurface); @@ -99,7 +98,7 @@ void WindowCompositor::onSurfaceCreated(QWaylandSurface *surface) connect(surface, &QWaylandSurface::offsetForNextFrame, this, &WindowCompositor::frameOffset); WindowCompositorView *view = new WindowCompositorView; view->setSurface(surface); - view->setOutput(output(m_window)); + view->setOutput(outputFor(m_window)); m_views << view; connect(view, &QWaylandView::surfaceDestroyed, this, &WindowCompositor::viewSurfaceDestroyed); } diff --git a/examples/wayland/server-buffer/compositor/main.cpp b/examples/wayland/server-buffer/compositor/main.cpp index 29f83959c..57ca647b6 100644 --- a/examples/wayland/server-buffer/compositor/main.cpp +++ b/examples/wayland/server-buffer/compositor/main.cpp @@ -42,7 +42,6 @@ #include "qwaylandquickcompositor.h" #include "qwaylandsurface.h" #include "qwaylandquickitem.h" -#include "qwaylandoutputspace.h" #include <QGuiApplication> #include <QTimer> @@ -86,7 +85,7 @@ public: m_view.setResizeMode(QQuickView::SizeRootObjectToView); m_view.setColor(Qt::black); m_view.create(); - m_output = new QWaylandQuickOutput(defaultOutputSpace(), &m_view); + m_output = new QWaylandQuickOutput(this, &m_view); connect(&m_view, &QQuickView::afterRendering, this, &QmlCompositor::sendCallbacks); |