Rename QBuffer::access property to accessType

Change-Id: Ie56a792272d2bf748a0d64096d46852ab718c37a
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

4 files changed, 9 insertions, 9 deletions

diff --git a/src/render/geometry/buffer.cpp b/src/render/geometry/buffer.cpp
index d91f2779f..1133b8e5e 100644
--- a/src/render/geometry/buffer.cpp
+++ b/src/render/geometry/buffer.cpp
@@ -146,7 +146,7 @@ void Buffer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
         } else if (propertyName == QByteArrayLiteral("usage")) {
             m_usage = static_cast<QBuffer::UsageType>(propertyChange->value().value<int>());
             m_bufferDirty = true;
-        } else if (propertyName == QByteArrayLiteral("access")) {
+        } else if (propertyName == QByteArrayLiteral("accessType")) {
             m_access = static_cast<QBuffer::AccessType>(propertyChange->value().value<int>());
         } else if (propertyName == QByteArrayLiteral("dataGenerator")) {
             QBufferDataGeneratorPtr newGenerator = propertyChange->value().value<QBufferDataGeneratorPtr>();
diff --git a/src/render/geometry/qbuffer.cpp b/src/render/geometry/qbuffer.cpp
index e767e0f74..b978e0e0b 100644
--- a/src/render/geometry/qbuffer.cpp
+++ b/src/render/geometry/qbuffer.cpp
@@ -412,12 +412,12 @@ void QBuffer::setSyncData(bool syncData)
     }
 }
 
-void QBuffer::setAccess(QBuffer::AccessType access)
+void QBuffer::setAccessType(QBuffer::AccessType access)
 {
     Q_D(QBuffer);
     if (d->m_access != access) {
         d->m_access = access;
-        Q_EMIT accessChanged(access);
+        Q_EMIT accessTypeChanged(access);
     }
 }
 
@@ -427,7 +427,7 @@ bool QBuffer::isSyncData() const
     return d->m_syncData;
 }
 
-QBuffer::AccessType QBuffer::access() const
+QBuffer::AccessType QBuffer::accessType() const
 {
     Q_D(const QBuffer);
     return d->m_access;
diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h
index 3e7f51086..7cb5acb0a 100644
--- a/src/render/geometry/qbuffer.h
+++ b/src/render/geometry/qbuffer.h
@@ -59,7 +59,7 @@ class QT3DRENDERSHARED_EXPORT QBuffer : public Qt3DCore::QNode
     Q_PROPERTY(BufferType type READ type WRITE setType NOTIFY typeChanged)
     Q_PROPERTY(UsageType usage READ usage WRITE setUsage NOTIFY usageChanged)
     Q_PROPERTY(bool syncData READ isSyncData WRITE setSyncData NOTIFY syncDataChanged)
-    Q_PROPERTY(AccessType access READ access WRITE setAccess NOTIFY accessChanged REVISION 9)
+    Q_PROPERTY(AccessType accessType READ accessType WRITE setAccessType NOTIFY accessTypeChanged REVISION 9)
 
 public:
     enum BufferType
@@ -101,7 +101,7 @@ public:
     UsageType usage() const;
     BufferType type() const;
     bool isSyncData() const;
-    AccessType access() const;
+    AccessType accessType() const;
 
     void setData(const QByteArray &bytes);
     QByteArray data() const;
@@ -115,7 +115,7 @@ public Q_SLOTS:
     void setType(BufferType type);
     void setUsage(UsageType usage);
     void setSyncData(bool syncData);
-    void setAccess(AccessType access);
+    void setAccessType(AccessType access);
 
 protected:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
@@ -125,7 +125,7 @@ Q_SIGNALS:
     void typeChanged(BufferType type);
     void usageChanged(UsageType usage);
     void syncDataChanged(bool syncData);
-    void accessChanged(AccessType access);
+    void accessTypeChanged(AccessType access);
     void dataAvailable();
 
 private:
diff --git a/tests/manual/buffercapture-qml/BufferSetterScene.qml b/tests/manual/buffercapture-qml/BufferSetterScene.qml
index 06eb046a3..2b2b2a85a 100644
--- a/tests/manual/buffercapture-qml/BufferSetterScene.qml
+++ b/tests/manual/buffercapture-qml/BufferSetterScene.qml
@@ -94,7 +94,7 @@ Entity {
         objectName: "buffer"
         type: Buffer.VertexBuffer
         data: initGraphBuffer()
-        access: Buffer.ReadWrite
+        accessType: Buffer.ReadWrite
     }
 
     ComputeMaterial {