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 /src/compositor/compositor_api/qwaylandcompositor_p.h | |
| 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 'src/compositor/compositor_api/qwaylandcompositor_p.h')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor_p.h | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor_p.h b/src/compositor/compositor_api/qwaylandcompositor_p.h index 3fd5a0671..a9bcdd5a4 100644 --- a/src/compositor/compositor_api/qwaylandcompositor_p.h +++ b/src/compositor/compositor_api/qwaylandcompositor_p.h @@ -40,7 +40,6 @@ #include <QtWaylandCompositor/qwaylandexport.h> #include <QtWaylandCompositor/QWaylandCompositor> -#include <QtWaylandCompositor/QWaylandOutputSpace> #include <QtCore/private/qobject_p.h> #include <QtCore/QSet> #include <QtCore/QElapsedTimer> @@ -72,8 +71,7 @@ public: void destroySurface(QWaylandSurface *surface); void unregisterSurface(QWaylandSurface *surface); - QWaylandOutput *defaultOutput() const { return defaultOutputSpace()->defaultOutput(); } - QWaylandOutputSpace *defaultOutputSpace() const { return outputSpaces.first(); } + QWaylandOutput *defaultOutput() const { return outputs.size() ? outputs.first() : Q_NULLPTR; } inline QtWayland::ClientBufferIntegration *clientBufferIntegration() const; inline QtWayland::ServerBufferIntegration *serverBufferIntegration() const; @@ -92,6 +90,9 @@ public: inline void removeClient(QWaylandClient *client); void addPolishObject(QObject *object); + + inline void addOutput(QWaylandOutput *output); + inline void removeOutput(QWaylandOutput *output); protected: void compositor_create_surface(Resource *resource, uint32_t id) Q_DECL_OVERRIDE; void compositor_create_region(Resource *resource, uint32_t id) Q_DECL_OVERRIDE; @@ -109,8 +110,8 @@ protected: struct wl_display *display; QList<QWaylandInputDevice *> inputDevices; + QList<QWaylandOutput *> outputs; - QList<QWaylandOutputSpace *> outputSpaces; QList<QWaylandSurface *> all_surfaces; QtWayland::DataDeviceManager *data_device_manager; @@ -168,6 +169,20 @@ void QWaylandCompositorPrivate::removeClient(QWaylandClient *client) clients.removeOne(client); } +void QWaylandCompositorPrivate::addOutput(QWaylandOutput *output) +{ + Q_ASSERT(output); + Q_ASSERT(!outputs.contains(output)); + outputs.append(output); +} + +void QWaylandCompositorPrivate::removeOutput(QWaylandOutput *output) +{ + Q_ASSERT(output); + Q_ASSERT(outputs.count(output) == 1); + outputs.removeOne(output); +} + QT_END_NAMESPACE #endif //QWAYLANDCOMPOSITOR_P_H |