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.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.h')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h index 7fe17c4f3..2413507e9 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.h +++ b/src/compositor/compositor_api/qwaylandcompositor.h @@ -60,7 +60,6 @@ class QWaylandSurface; class QWaylandInputDevice; class QWaylandGlobalInterface; class QWaylandView; -class QWaylandOutputSpace; class QWaylandPointer; class QWaylandKeyboard; class QWaylandTouch; @@ -71,7 +70,6 @@ class Q_COMPOSITOR_EXPORT QWaylandCompositor : public QObject, public QWaylandEx Q_DECLARE_PRIVATE(QWaylandCompositor) Q_PROPERTY(QByteArray socketName READ socketName WRITE setSocketName) Q_PROPERTY(bool retainedSelection READ retainedSelectionEnabled WRITE setRetainedSelectionEnabled) - Q_PROPERTY(QWaylandOutputSpace *defaultOutputSpace READ defaultOutputSpace WRITE setDefaultOutputSpace NOTIFY defaultOutputSpaceChanged) Q_PROPERTY(QWaylandOutput *defaultOutput READ defaultOutput NOTIFY defaultOutputChanged) Q_PROPERTY(bool useHardwareIntegrationExtension READ useHardwareIntegrationExtension WRITE setUseHardwareIntegrationExtension NOTIFY useHardwareIntegrationExtensionChanged) Q_PROPERTY(QWaylandInputDevice *defaultInputDevice READ defaultInputDevice CONSTANT) @@ -96,14 +94,10 @@ public: QList<QWaylandSurface *> surfaces() const; QList<QWaylandSurface *> surfacesForClient(QWaylandClient* client) const; - Q_INVOKABLE QWaylandOutput *output(QWindow *window) const; + Q_INVOKABLE QWaylandOutput *outputFor(QWindow *window) const; QWaylandOutput *defaultOutput() const; - - QWaylandOutputSpace *defaultOutputSpace() const; - void setDefaultOutputSpace(QWaylandOutputSpace *outputSpace); - void addOutputSpace(QWaylandOutputSpace *outputSpace); - void removeOutputSpace(QWaylandOutputSpace *outputSpace); + QList<QWaylandOutput *> outputs() const; uint currentTimeMsecs() const; @@ -128,9 +122,7 @@ Q_SIGNALS: void surfaceCreated(QWaylandSurface *surface); void surfaceAboutToBeDestroyed(QWaylandSurface *surface); - void defaultOutputSpaceChanged(); void defaultOutputChanged(); - void outputSpacesChanged(); void useHardwareIntegrationExtensionChanged(); protected: |