diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2016-06-30 14:37:15 +0200 |
---|---|---|
committer | Johan Helsing <johan.helsing@qt.io> | 2016-07-04 09:26:12 +0000 |
commit | a8a3573eb4bfa59bad6aa9b2ceef4393b39f0792 (patch) | |
tree | 1ae24b325d1311d5c6460ba856f8be27cb12ff8c | |
parent | 37479b8053b7cb9fcad79b4ecedc11925d82e1e8 (diff) |
Rename bufferLock to bufferLocked
Change-Id: Ia3e0fa53579ee0d28b1d6b7384b9c6def2761a2b
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org>
-rw-r--r-- | examples/wayland/multi-output/qml/ShellChrome.qml | 2 | ||||
-rw-r--r-- | examples/wayland/pure-qml/qml/Chrome.qml | 2 | ||||
-rw-r--r-- | src/compositor/compositor_api/qwaylandview.cpp | 14 | ||||
-rw-r--r-- | src/compositor/compositor_api/qwaylandview.h | 6 | ||||
-rw-r--r-- | src/compositor/compositor_api/qwaylandview_p.h | 4 | ||||
-rw-r--r-- | src/imports/compositor/plugins.qmltypes | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/examples/wayland/multi-output/qml/ShellChrome.qml b/examples/wayland/multi-output/qml/ShellChrome.qml index dac3eb096..b88414b25 100644 --- a/examples/wayland/multi-output/qml/ShellChrome.qml +++ b/examples/wayland/multi-output/qml/ShellChrome.qml @@ -45,7 +45,7 @@ ShellSurfaceItem { id: rootChrome onSurfaceDestroyed: { - view.bufferLock = true; + view.bufferLocked = true; destroyAnimation.start(); } diff --git a/examples/wayland/pure-qml/qml/Chrome.qml b/examples/wayland/pure-qml/qml/Chrome.qml index 1c9066ef1..63b6038ab 100644 --- a/examples/wayland/pure-qml/qml/Chrome.qml +++ b/examples/wayland/pure-qml/qml/Chrome.qml @@ -45,7 +45,7 @@ ShellSurfaceItem { id: rootChrome onSurfaceDestroyed: { - view.bufferLock = true; + view.bufferLocked = true; destroyAnimation.start(); } diff --git a/src/compositor/compositor_api/qwaylandview.cpp b/src/compositor/compositor_api/qwaylandview.cpp index 793dcf202..f11ef5fe0 100644 --- a/src/compositor/compositor_api/qwaylandview.cpp +++ b/src/compositor/compositor_api/qwaylandview.cpp @@ -144,7 +144,7 @@ void QWaylandView::setSurface(QWaylandSurface *newSurface) d->surface = newSurface; - if (!d->bufferLock) { + if (!d->bufferLocked) { d->currentBuffer = QWaylandBufferRef(); d->currentDamage = QRegion(); } @@ -231,7 +231,7 @@ bool QWaylandView::advance() if (d->currentBuffer == d->nextBuffer && !d->forceAdvanceSucceed) return false; - if (d->bufferLock) + if (d->bufferLocked) return false; if (d->surface && d->surface->throttlingView() == this) { @@ -280,7 +280,7 @@ QRegion QWaylandView::currentDamage() } /*! - * \qmlproperty bool QtWaylandCompositor::WaylandView::bufferLock + * \qmlproperty bool QtWaylandCompositor::WaylandView::bufferLocked * * This property holds whether the view's buffer is currently locked. When * the buffer is locked, advance() will not advance to the next buffer, @@ -290,7 +290,7 @@ QRegion QWaylandView::currentDamage() */ /*! - * \property QWaylandView::bufferLock + * \property QWaylandView::bufferLocked * * This property holds whether the view's buffer is currently locked. When * the buffer is locked, advance() will not advance to the next buffer, @@ -301,13 +301,13 @@ QRegion QWaylandView::currentDamage() bool QWaylandView::isBufferLocked() const { Q_D(const QWaylandView); - return d->bufferLock; + return d->bufferLocked; } -void QWaylandView::setBufferLock(bool locked) +void QWaylandView::setBufferLocked(bool locked) { Q_D(QWaylandView); - d->bufferLock = locked; + d->bufferLocked = locked; } /*! diff --git a/src/compositor/compositor_api/qwaylandview.h b/src/compositor/compositor_api/qwaylandview.h index f89d8ca78..a6c5dce90 100644 --- a/src/compositor/compositor_api/qwaylandview.h +++ b/src/compositor/compositor_api/qwaylandview.h @@ -56,7 +56,7 @@ class Q_WAYLAND_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(bool bufferLock READ isBufferLocked WRITE setBufferLock NOTIFY bufferLockChanged) + Q_PROPERTY(bool bufferLocked READ isBufferLocked WRITE setBufferLocked NOTIFY bufferLockedChanged) Q_PROPERTY(bool discardFrontBuffers READ discardFrontBuffers WRITE setDiscardFrontBuffers NOTIFY discardFrontBuffersChanged) public: QWaylandView(QObject *renderObject = nullptr, QObject *parent = nullptr); @@ -77,7 +77,7 @@ public: virtual QRegion currentDamage(); bool isBufferLocked() const; - void setBufferLock(bool locked); + void setBufferLocked(bool locked); bool discardFrontBuffers() const; void setDiscardFrontBuffers(bool discard); @@ -88,7 +88,7 @@ Q_SIGNALS: void surfaceChanged(); void surfaceDestroyed(); void outputChanged(); - void bufferLockChanged(); + void bufferLockedChanged(); void discardFrontBuffersChanged(); }; diff --git a/src/compositor/compositor_api/qwaylandview_p.h b/src/compositor/compositor_api/qwaylandview_p.h index 8c4cea085..768ebd4bc 100644 --- a/src/compositor/compositor_api/qwaylandview_p.h +++ b/src/compositor/compositor_api/qwaylandview_p.h @@ -69,7 +69,7 @@ public: : renderObject(Q_NULLPTR) , surface(Q_NULLPTR) , output(Q_NULLPTR) - , bufferLock(false) + , bufferLocked(false) , broadcastRequestedPositionChanged(false) , forceAdvanceSucceed(false) , discardFrontBuffers(false) @@ -86,7 +86,7 @@ public: QRegion currentDamage; QWaylandBufferRef nextBuffer; QRegion nextDamage; - bool bufferLock; + bool bufferLocked; bool broadcastRequestedPositionChanged; bool forceAdvanceSucceed; bool discardFrontBuffers; diff --git a/src/imports/compositor/plugins.qmltypes b/src/imports/compositor/plugins.qmltypes index 3025fede6..fdcc63d0f 100644 --- a/src/imports/compositor/plugins.qmltypes +++ b/src/imports/compositor/plugins.qmltypes @@ -379,7 +379,7 @@ Module { Property { name: "renderObject"; type: "QObject"; isReadonly: true; isPointer: true } Property { name: "surface"; type: "QWaylandSurface"; isPointer: true } Property { name: "output"; type: "QWaylandOutput"; isPointer: true } - Property { name: "bufferLock"; type: "bool" } + Property { name: "bufferLocked"; type: "bool" } Property { name: "discardFrontBuffers"; type: "bool" } Signal { name: "surfaceDestroyed" } } |