summaryrefslogtreecommitdiffstats
path: root/src/extras
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2019-10-04 14:49:12 +0200
committerPaul Lemire <paul.lemire@kdab.com>2019-10-07 10:26:49 +0200
commit69f3b01eb9ad99c251a3a28fabdc4f524679cd35 (patch)
treefea6c1949181a82561a3a3351c25bb18d9fa47cd /src/extras
parentf36768ea6ea9e3b18963210682502e3b0cdcc5f3 (diff)
QForwardRenderer: rename clearBuffers to buffersToClear
Change-Id: Ifda1f6f69a6dc58d426dfddbd711620c185a30ab Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/extras')
-rw-r--r--src/extras/defaults/qforwardrenderer.cpp10
-rw-r--r--src/extras/defaults/qforwardrenderer.h8
2 files changed, 9 insertions, 9 deletions
diff --git a/src/extras/defaults/qforwardrenderer.cpp b/src/extras/defaults/qforwardrenderer.cpp
index dd3c872cc..f1306e787 100644
--- a/src/extras/defaults/qforwardrenderer.cpp
+++ b/src/extras/defaults/qforwardrenderer.cpp
@@ -139,7 +139,7 @@ QForwardRenderer::QForwardRenderer(QNode *parent)
{
Q_D(QForwardRenderer);
QObject::connect(d->m_clearBuffer, &QClearBuffers::clearColorChanged, this, &QForwardRenderer::clearColorChanged);
- QObject::connect(d->m_clearBuffer, &QClearBuffers::buffersChanged, this, &QForwardRenderer::clearBuffersChanged);
+ QObject::connect(d->m_clearBuffer, &QClearBuffers::buffersChanged, this, &QForwardRenderer::buffersToClearChanged);
QObject::connect(d->m_viewport, &QViewport::normalizedRectChanged, this, &QForwardRenderer::viewportRectChanged);
QObject::connect(d->m_cameraSelector, &QCameraSelector::cameraChanged, this, &QForwardRenderer::cameraChanged);
QObject::connect(d->m_surfaceSelector, &QRenderSurfaceSelector::surfaceChanged, this, &QForwardRenderer::surfaceChanged);
@@ -165,7 +165,7 @@ void QForwardRenderer::setClearColor(const QColor &clearColor)
d->m_clearBuffer->setClearColor(clearColor);
}
-void QForwardRenderer::setClearBuffers(QClearBuffers::BufferType buffers)
+void QForwardRenderer::setBuffersToClear(QClearBuffers::BufferType buffers)
{
Q_D(QForwardRenderer);
d->m_clearBuffer->setBuffers(buffers);
@@ -236,18 +236,18 @@ QColor QForwardRenderer::clearColor() const
}
/*!
- \qmlproperty color ForwardRenderer::clearBuffers
+ \qmlproperty color ForwardRenderer::buffersToClear
Holds the current buffers to be cleared. Default value is ColorDepthBuffer
\since 5.14
*/
/*!
- \property QForwardRenderer::clearBuffers
+ \property QForwardRenderer::buffersToClear
Holds the current buffers to be cleared. Default value is ColorDepthBuffer
\since 5.14
*/
-QClearBuffers::BufferType QForwardRenderer::clearBuffers() const
+QClearBuffers::BufferType QForwardRenderer::buffersToClear() const
{
Q_D(const QForwardRenderer);
return d->m_clearBuffer->buffers();
diff --git a/src/extras/defaults/qforwardrenderer.h b/src/extras/defaults/qforwardrenderer.h
index 0b53a094b..a34d39560 100644
--- a/src/extras/defaults/qforwardrenderer.h
+++ b/src/extras/defaults/qforwardrenderer.h
@@ -61,7 +61,7 @@ class Q_3DEXTRASSHARED_EXPORT QForwardRenderer : public Qt3DRender::QTechniqueFi
Q_PROPERTY(QObject *window READ surface WRITE setSurface NOTIFY surfaceChanged)
Q_PROPERTY(QRectF viewportRect READ viewportRect WRITE setViewportRect NOTIFY viewportRectChanged)
Q_PROPERTY(QColor clearColor READ clearColor WRITE setClearColor NOTIFY clearColorChanged)
- Q_PROPERTY(Qt3DRender::QClearBuffers::BufferType clearBuffers READ clearBuffers WRITE setClearBuffers NOTIFY clearBuffersChanged REVISION 14)
+ Q_PROPERTY(Qt3DRender::QClearBuffers::BufferType buffersToClear READ buffersToClear WRITE setBuffersToClear NOTIFY buffersToClearChanged REVISION 14)
Q_PROPERTY(Qt3DCore::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged)
Q_PROPERTY(QSize externalRenderTargetSize READ externalRenderTargetSize WRITE setExternalRenderTargetSize NOTIFY externalRenderTargetSizeChanged)
Q_PROPERTY(bool frustumCulling READ isFrustumCullingEnabled WRITE setFrustumCullingEnabled NOTIFY frustumCullingEnabledChanged)
@@ -72,7 +72,7 @@ public:
QRectF viewportRect() const;
QColor clearColor() const;
- Qt3DRender::QClearBuffers::BufferType clearBuffers() const;
+ Qt3DRender::QClearBuffers::BufferType buffersToClear() const;
Qt3DCore::QEntity *camera() const;
QObject *surface() const;
QSize externalRenderTargetSize() const;
@@ -82,7 +82,7 @@ public:
public Q_SLOTS:
void setViewportRect(const QRectF &viewportRect);
void setClearColor(const QColor &clearColor);
- void setClearBuffers(Qt3DRender::QClearBuffers::BufferType);
+ void setBuffersToClear(Qt3DRender::QClearBuffers::BufferType);
void setCamera(Qt3DCore::QEntity *camera);
void setSurface(QObject * surface);
void setExternalRenderTargetSize(const QSize &size);
@@ -92,7 +92,7 @@ public Q_SLOTS:
Q_SIGNALS:
void viewportRectChanged(const QRectF &viewportRect);
void clearColorChanged(const QColor &clearColor);
- void clearBuffersChanged(Qt3DRender::QClearBuffers::BufferType);
+ void buffersToClearChanged(Qt3DRender::QClearBuffers::BufferType);
void cameraChanged(Qt3DCore::QEntity *camera);
void surfaceChanged(QObject *surface);
void externalRenderTargetSizeChanged(const QSize &size);