QBuffer rename sync to syncData

As per API review

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

8 files changed, 34 insertions, 34 deletions

diff --git a/src/render/geometry/buffer.cpp b/src/render/geometry/buffer.cpp
index f5f0050bb..fe6d5f3f5 100644
--- a/src/render/geometry/buffer.cpp
+++ b/src/render/geometry/buffer.cpp
@@ -54,7 +54,7 @@ Buffer::Buffer()
     , m_type(QBuffer::VertexBuffer)
     , m_usage(QBuffer::StaticDraw)
     , m_bufferDirty(false)
-    , m_sync(false)
+    , m_syncData(false)
     , m_manager(Q_NULLPTR)
 {
     // Maybe it could become read write if we want to inform
@@ -72,7 +72,7 @@ void Buffer::cleanup()
     m_data.clear();
     m_functor.reset();
     m_bufferDirty = false;
-    m_sync = false;
+    m_syncData = false;
 }
 
 
@@ -85,7 +85,7 @@ void Buffer::executeFunctor()
 {
     Q_ASSERT(m_functor);
     m_data = (*m_functor)();
-    if (m_sync) {
+    if (m_syncData) {
         // Send data back to the frontend
         QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(NodeUpdated, peerUuid()));
         e->setPropertyName("data");
@@ -107,7 +107,7 @@ void Buffer::updateFromPeer(Qt3DCore::QNode *peer)
         if (m_functor && m_manager != Q_NULLPTR)
             m_manager->addDirtyBuffer(peerUuid());
         m_bufferDirty = true;
-        m_sync = buffer->isSync();
+        m_syncData = buffer->isSyncData();
     }
 }
 
@@ -132,8 +132,8 @@ void Buffer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
             m_functor = newFunctor;
             if (m_functor && m_manager != Q_NULLPTR)
                 m_manager->addDirtyBuffer(peerUuid());
-        } else if (propertyName == QByteArrayLiteral("sync")) {
-            m_sync = propertyChange->value().toBool();
+        } else if (propertyName == QByteArrayLiteral("syncData")) {
+            m_syncData = propertyChange->value().toBool();
         }
         markDirty(AbstractRenderer::AllDirty);
     }
diff --git a/src/render/geometry/buffer_p.h b/src/render/geometry/buffer_p.h
index ccf88bbc0..f39a631e7 100644
--- a/src/render/geometry/buffer_p.h
+++ b/src/render/geometry/buffer_p.h
@@ -81,7 +81,7 @@ public:
     inline QByteArray data() const { return m_data; }
     inline bool isDirty() const { return m_bufferDirty; }
     inline QBufferFunctorPtr bufferFunctor() const { return m_functor; }
-    inline bool isSync() const { return m_sync; }
+    inline bool isSyncData() const { return m_syncData; }
     void unsetDirty();
 
 private:
@@ -89,7 +89,7 @@ private:
     QBuffer::UsageType m_usage;
     QByteArray m_data;
     bool m_bufferDirty;
-    bool m_sync;
+    bool m_syncData;
     QBufferFunctorPtr m_functor;
     BufferManager *m_manager;
 };
diff --git a/src/render/geometry/qbuffer.cpp b/src/render/geometry/qbuffer.cpp
index a57d06284..feddb8bf9 100644
--- a/src/render/geometry/qbuffer.cpp
+++ b/src/render/geometry/qbuffer.cpp
@@ -51,7 +51,7 @@ namespace Qt3DRender {
 QBufferPrivate::QBufferPrivate()
     : QNodePrivate()
     , m_usage(QBuffer::StaticDraw)
-    , m_sync(false)
+    , m_syncData(false)
 {
 }
 
@@ -74,11 +74,11 @@ QBufferPrivate::QBufferPrivate()
  */
 
 /*!
- * \qmlproperty bool Buffer::sync
+ * \qmlproperty bool Buffer::syncData
  *
- * Holds the sync flag. When sync is true, this will force data created
+ * Holds the syncData flag. When syncData is true, this will force data created
  * by a Qt3DRender::QBufferFunctor to also be updated on the frontend
- * Qt3DRender::QBuffer node. By default sync is false.
+ * Qt3DRender::QBuffer node. By default syncData is false.
  *
  * \note: This has no effect if the buffer's data was set directly using the data
  * property.
@@ -172,7 +172,7 @@ void QBuffer::copy(const QNode *ref)
     d_func()->m_type = buffer->d_func()->m_type;
     d_func()->m_usage = buffer->d_func()->m_usage;
     d_func()->m_functor = buffer->d_func()->m_functor;
-    d_func()->m_sync = buffer->d_func()->m_sync;
+    d_func()->m_syncData = buffer->d_func()->m_syncData;
 }
 
 /*!
@@ -268,28 +268,28 @@ QBufferFunctorPtr QBuffer::bufferFunctor() const
 }
 
 /*!
- * \property QBuffer::sync
+ * \property QBuffer::syncData
  *
- * Holds the sync flag. When sync is true, this will force data created
+ * Holds the syncData flag. When syncData is true, this will force data created
  * by a Qt3DRender::QBufferFunctor to also be updated on the frontend
- * Qt3DRender::QBuffer node. By default sync is false.
+ * Qt3DRender::QBuffer node. By default syncData is false.
  *
  * \note: This has no effect if the buffer's data was set directly using the data
  * property.
  */
-void QBuffer::setSync(bool sync)
+void QBuffer::setSyncData(bool syncData)
 {
     Q_D(QBuffer);
-    if (d->m_sync != sync) {
-        d->m_sync = sync;
-        emit syncChanged(sync);
+    if (d->m_syncData != syncData) {
+        d->m_syncData = syncData;
+        emit syncDataChanged(syncData);
     }
 }
 
-bool QBuffer::isSync() const
+bool QBuffer::isSyncData() const
 {
     Q_D(const QBuffer);
-    return d->m_sync;
+    return d->m_syncData;
 }
 
 void QBuffer::setType(QBuffer::BufferType type)
diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h
index fa2b8b171..eaa200d32 100644
--- a/src/render/geometry/qbuffer.h
+++ b/src/render/geometry/qbuffer.h
@@ -57,7 +57,7 @@ class QT3DRENDERSHARED_EXPORT QBuffer : public Qt3DCore::QNode
     Q_OBJECT
     Q_PROPERTY(BufferType type READ type WRITE setType NOTIFY typeChanged)
     Q_PROPERTY(UsageType usage READ usage WRITE setUsage NOTIFY usageChanged)
-    Q_PROPERTY(bool sync READ isSync WRITE setSync NOTIFY syncChanged)
+    Q_PROPERTY(bool syncData READ isSyncData WRITE setSyncData NOTIFY syncDataChanged)
 
 public:
     enum BufferType
@@ -90,7 +90,7 @@ public:
 
     UsageType usage() const;
     BufferType type() const;
-    bool isSync() const;
+    bool isSyncData() const;
 
     void setData(const QByteArray &bytes);
     QByteArray data() const;
@@ -101,7 +101,7 @@ public:
 public Q_SLOTS:
     void setType(BufferType type);
     void setUsage(UsageType usage);
-    void setSync(bool sync);
+    void setSyncData(bool syncData);
 
 protected:
     void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
@@ -111,7 +111,7 @@ Q_SIGNALS:
     void dataChanged(const QByteArray &bytes);
     void typeChanged(BufferType type);
     void usageChanged(UsageType usage);
-    void syncChanged(bool sync);
+    void syncDataChanged(bool syncData);
 
 private:
     Q_DECLARE_PRIVATE(QBuffer)
diff --git a/src/render/geometry/qbuffer_p.h b/src/render/geometry/qbuffer_p.h
index c45b91ccd..821d60358 100644
--- a/src/render/geometry/qbuffer_p.h
+++ b/src/render/geometry/qbuffer_p.h
@@ -73,7 +73,7 @@ public:
     QBuffer::BufferType m_type;
     QBuffer::UsageType m_usage;
     QBufferFunctorPtr m_functor;
-    bool m_sync;
+    bool m_syncData;
 };
 
 } // namespace Qt3DRender
diff --git a/tests/auto/render/buffer/tst_buffer.cpp b/tests/auto/render/buffer/tst_buffer.cpp
index aeab3ade4..a0ade76f3 100644
--- a/tests/auto/render/buffer/tst_buffer.cpp
+++ b/tests/auto/render/buffer/tst_buffer.cpp
@@ -189,11 +189,11 @@ private Q_SLOTS:
         // WHEN
         updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setValue(true);
-        updateChange->setPropertyName("sync");
+        updateChange->setPropertyName("syncData");
         renderBuffer.sceneChangeEvent(updateChange);
 
         // THEN
-        QCOMPARE(renderBuffer.isSync(), true);
+        QCOMPARE(renderBuffer.isSyncData(), true);
         QVERIFY(!renderBuffer.isDirty());
 
         // WHEN
diff --git a/tests/auto/render/qbuffer/tst_qbuffer.cpp b/tests/auto/render/qbuffer/tst_qbuffer.cpp
index 1ef8d0587..c2da0618d 100644
--- a/tests/auto/render/qbuffer/tst_qbuffer.cpp
+++ b/tests/auto/render/qbuffer/tst_qbuffer.cpp
@@ -91,7 +91,7 @@ private Q_SLOTS:
         indexBuffer->setUsage(Qt3DRender::QBuffer::StaticCopy);
         indexBuffer->setData(QByteArrayLiteral("For displacement"));
         indexBuffer->setBufferFunctor(Qt3DRender::QBufferFunctorPtr(new TestFunctor(1340)));
-        indexBuffer->setSync(true);
+        indexBuffer->setSyncData(true);
         QTest::newRow("index") << indexBuffer;
     }
 
@@ -111,7 +111,7 @@ private Q_SLOTS:
         QCOMPARE(buffer->usage(), clone->usage());
         QCOMPARE(buffer->type(), clone->type());
         QCOMPARE(buffer->bufferFunctor(), clone->bufferFunctor());
-        QCOMPARE(buffer->isSync(), clone->isSync());
+        QCOMPARE(buffer->isSyncData(), clone->isSyncData());
         if (buffer->bufferFunctor()) {
             QVERIFY(clone->bufferFunctor());
             QVERIFY(*clone->bufferFunctor() == *buffer->bufferFunctor());
@@ -174,13 +174,13 @@ private Q_SLOTS:
         arbiter.events.clear();
 
         // WHEN
-        buffer->setSync(true);
+        buffer->setSyncData(true);
         QCoreApplication::processEvents();
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
         change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
-        QCOMPARE(change->propertyName(), "sync");
+        QCOMPARE(change->propertyName(), "syncData");
         QCOMPARE(change->value().toBool(), true);
 
         arbiter.events.clear();
diff --git a/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp b/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp
index 1803b09ae..0ff9bc238 100644
--- a/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp
+++ b/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp
@@ -119,7 +119,7 @@ private Q_SLOTS:
                 QCOMPARE(buffer->usage(), clonedBuffer->usage());
                 QCOMPARE(buffer->type(), clonedBuffer->type());
                 QCOMPARE(buffer->bufferFunctor(), clonedBuffer->bufferFunctor());
-                QCOMPARE(buffer->isSync(), clonedBuffer->isSync());
+                QCOMPARE(buffer->isSyncData(), clonedBuffer->isSyncData());
                 if (buffer->bufferFunctor()) {
                     QVERIFY(clonedBuffer->bufferFunctor());
                     QVERIFY(*clonedBuffer->bufferFunctor() == *buffer->bufferFunctor());