From f5f06c709937b657c66ca4e35f4e3065ba390153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Mon, 14 Sep 2015 12:35:52 +0200 Subject: Remove global coordinates This involves removing: - pickView and mapView from QWaylandOutput - requestedPos[X,Y] from QWaylandView Change-Id: Ie53eef434ac6ae7d0d5474f649f78a59ae857167 Reviewed-by: Paul Olav Tvete --- src/compositor/compositor_api/qwaylandview.h | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'src/compositor/compositor_api/qwaylandview.h') diff --git a/src/compositor/compositor_api/qwaylandview.h b/src/compositor/compositor_api/qwaylandview.h index 47d1f9112..7eba0c809 100644 --- a/src/compositor/compositor_api/qwaylandview.h +++ b/src/compositor/compositor_api/qwaylandview.h @@ -56,9 +56,6 @@ class Q_COMPOSITOR_EXPORT QWaylandView : public QObject Q_PROPERTY(QObject *renderObject READ renderObject CONSTANT) Q_PROPERTY(QWaylandSurface *surface READ surface WRITE setSurface NOTIFY surfaceChanged) Q_PROPERTY(QWaylandOutput *output READ output WRITE setOutput NOTIFY outputChanged) - Q_PROPERTY(QPointF requestedPosition READ requestedPosition WRITE setRequestedPosition NOTIFY requestedPositionChanged) - Q_PROPERTY(qreal requestedXPosition READ requestedXPosition WRITE setRequestedXPosition NOTIFY requestedXPositionChanged) - Q_PROPERTY(qreal requestedYPosition READ requestedYPosition WRITE setRequestedYPosition NOTIFY requestedYPositionChanged) Q_PROPERTY(bool bufferLock READ isBufferLocked WRITE setBufferLock NOTIFY bufferLockChanged) public: QWaylandView(QObject *renderObject = 0, QObject *parent = 0); @@ -72,13 +69,6 @@ public: QWaylandOutput *output() const; void setOutput(QWaylandOutput *output); - QPointF requestedPosition() const; - void setRequestedPosition(const QPointF &pos); - qreal requestedXPosition() const; - void setRequestedXPosition(qreal xPos); - qreal requestedYPosition() const; - void setRequestedYPosition(qreal yPos); - virtual void attach(const QWaylandBufferRef &ref, const QRegion &damage); virtual bool advance(); virtual void discardCurrentBuffer(); @@ -94,9 +84,6 @@ Q_SIGNALS: void surfaceChanged(); void surfaceDestroyed(); void outputChanged(); - void requestedPositionChanged(); - void requestedXPositionChanged(); - void requestedYPositionChanged(); void bufferLockChanged(); }; -- cgit v1.2.3