QBufferFunctor renamed to QBufferDataGenerator

bufferFunctor -> dataGenerator

As per API review

Change-Id: Ie67fff2fd6b75574ca840bd43836028c0726ec5e
Task-number: QTBUG-51469
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

4 files changed, 31 insertions, 31 deletions

diff --git a/tests/auto/render/buffer/tst_buffer.cpp b/tests/auto/render/buffer/tst_buffer.cpp
index b95b214d8..ee04d26c0 100644
--- a/tests/auto/render/buffer/tst_buffer.cpp
+++ b/tests/auto/render/buffer/tst_buffer.cpp
@@ -33,7 +33,7 @@
 #include "testpostmanarbiter.h"
 #include "testrenderer.h"
 
-class TestFunctor : public Qt3DRender::QBufferFunctor
+class TestFunctor : public Qt3DRender::QBufferDataGenerator
 {
 public:
     explicit TestFunctor(int size)
@@ -45,7 +45,7 @@ public:
         return QByteArrayLiteral("454");
     }
 
-    bool operator ==(const Qt3DRender::QBufferFunctor &other) const
+    bool operator ==(const Qt3DRender::QBufferDataGenerator &other) const
     {
         const TestFunctor *otherFunctor = functor_cast<TestFunctor>(&other);
         if (otherFunctor != Q_NULLPTR)
@@ -71,7 +71,7 @@ private Q_SLOTS:
         Qt3DRender::QBuffer buffer(Qt3DRender::QBuffer::IndexBuffer);
         buffer.setUsage(Qt3DRender::QBuffer::DynamicCopy);
         buffer.setData(QByteArrayLiteral("Corvette"));
-        buffer.setBufferFunctor(Qt3DRender::QBufferFunctorPtr(new TestFunctor(883)));
+        buffer.setDataGenerator(Qt3DRender::QBufferDataGeneratorPtr(new TestFunctor(883)));
 
         // WHEN
         renderBuffer.setPeer(&buffer);
@@ -82,8 +82,8 @@ private Q_SLOTS:
         QCOMPARE(renderBuffer.type(), buffer.type());
         QCOMPARE(renderBuffer.usage(), buffer.usage());
         QCOMPARE(renderBuffer.data(), buffer.data());
-        QCOMPARE(renderBuffer.bufferFunctor(), buffer.bufferFunctor());
-        QVERIFY(*renderBuffer.bufferFunctor() == *buffer.bufferFunctor());
+        QCOMPARE(renderBuffer.dataGenerator(), buffer.dataGenerator());
+        QVERIFY(*renderBuffer.dataGenerator() == *buffer.dataGenerator());
     }
 
     void checkInitialAndCleanedUpState()
@@ -97,13 +97,13 @@ private Q_SLOTS:
         QCOMPARE(renderBuffer.usage(), Qt3DRender::QBuffer::StaticDraw);
         QVERIFY(renderBuffer.data().isEmpty());
         QVERIFY(renderBuffer.peerId().isNull());
-        QVERIFY(renderBuffer.bufferFunctor().isNull());
+        QVERIFY(renderBuffer.dataGenerator().isNull());
 
         // GIVEN
         Qt3DRender::QBuffer buffer(Qt3DRender::QBuffer::IndexBuffer);
         buffer.setUsage(Qt3DRender::QBuffer::DynamicCopy);
         buffer.setData(QByteArrayLiteral("C7"));
-        buffer.setBufferFunctor(Qt3DRender::QBufferFunctorPtr(new TestFunctor(73)));
+        buffer.setDataGenerator(Qt3DRender::QBufferDataGeneratorPtr(new TestFunctor(73)));
 
         // WHEN
         renderBuffer.updateFromPeer(&buffer);
@@ -114,7 +114,7 @@ private Q_SLOTS:
         QCOMPARE(renderBuffer.type(), Qt3DRender::QBuffer::VertexBuffer);
         QCOMPARE(renderBuffer.usage(), Qt3DRender::QBuffer::StaticDraw);
         QVERIFY(renderBuffer.data().isEmpty());
-        QVERIFY(renderBuffer.bufferFunctor().isNull());
+        QVERIFY(renderBuffer.dataGenerator().isNull());
     }
 
     void checkPropertyChanges()
@@ -173,14 +173,14 @@ private Q_SLOTS:
 
 
         // WHEN
-        Qt3DRender::QBufferFunctorPtr functor(new TestFunctor(355));
+        Qt3DRender::QBufferDataGeneratorPtr functor(new TestFunctor(355));
         updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setValue(QVariant::fromValue(functor));
-        updateChange->setPropertyName("bufferFunctor");
+        updateChange->setPropertyName("dataGenerator");
         renderBuffer.sceneChangeEvent(updateChange);
 
         // THEN
-        QCOMPARE(renderBuffer.bufferFunctor(), functor);
+        QCOMPARE(renderBuffer.dataGenerator(), functor);
         QVERIFY(renderBuffer.isDirty());
 
         renderBuffer.unsetDirty();
diff --git a/tests/auto/render/picking/tst_picking.cpp b/tests/auto/render/picking/tst_picking.cpp
index b9dfe6135..d379966d0 100644
--- a/tests/auto/render/picking/tst_picking.cpp
+++ b/tests/auto/render/picking/tst_picking.cpp
@@ -37,7 +37,7 @@
 #include <Qt3DRender/qspheremesh.h>
 #include <Qt3DRender/qattribute.h>
 #include <Qt3DRender/qbuffer.h>
-#include <Qt3DRender/qbufferfunctor.h>
+#include <Qt3DRender/qbufferdatagenerator.h>
 #include <Qt3DRender/qspheregeometry.h>
 #include <Qt3DRender/qpickevent.h>
 #include <Qt3DCore/qbackendscenepropertychange.h>
@@ -80,7 +80,7 @@ public:
         Qt3DRender::QBuffer *vertexBuffer = static_cast<Qt3DRender::QBuffer *>(positionAttr->buffer());
 
         // Load the geometry
-        const QByteArray data = (*vertexBuffer->bufferFunctor())();
+        const QByteArray data = (*vertexBuffer->dataGenerator())();
         vertexBuffer->setData(data);
 
         transform->setTranslation(position);
diff --git a/tests/auto/render/qbuffer/tst_qbuffer.cpp b/tests/auto/render/qbuffer/tst_qbuffer.cpp
index c2da0618d..f4b4f8f71 100644
--- a/tests/auto/render/qbuffer/tst_qbuffer.cpp
+++ b/tests/auto/render/qbuffer/tst_qbuffer.cpp
@@ -31,11 +31,11 @@
 #include <Qt3DCore/private/qscene_p.h>
 
 #include <Qt3DRender/qbuffer.h>
-#include <Qt3DRender/qbufferfunctor.h>
+#include <Qt3DRender/qbufferdatagenerator.h>
 
 #include "testpostmanarbiter.h"
 
-class TestFunctor : public Qt3DRender::QBufferFunctor
+class TestFunctor : public Qt3DRender::QBufferDataGenerator
 {
 public:
     explicit TestFunctor(int size)
@@ -47,7 +47,7 @@ public:
         return QByteArray();
     }
 
-    bool operator ==(const Qt3DRender::QBufferFunctor &other) const
+    bool operator ==(const Qt3DRender::QBufferDataGenerator &other) const
     {
         const TestFunctor *otherFunctor = functor_cast<TestFunctor>(&other);
         if (otherFunctor != Q_NULLPTR)
@@ -84,13 +84,13 @@ private Q_SLOTS:
         Qt3DRender::QBuffer *buffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer);
         buffer->setUsage(Qt3DRender::QBuffer::DynamicRead);
         buffer->setData(QByteArrayLiteral("There's no replacement"));
-        buffer->setBufferFunctor(Qt3DRender::QBufferFunctorPtr(new TestFunctor(883)));
+        buffer->setDataGenerator(Qt3DRender::QBufferDataGeneratorPtr(new TestFunctor(883)));
         QTest::newRow("vertex") << buffer;
 
         Qt3DRender::QBuffer *indexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::IndexBuffer);
         indexBuffer->setUsage(Qt3DRender::QBuffer::StaticCopy);
         indexBuffer->setData(QByteArrayLiteral("For displacement"));
-        indexBuffer->setBufferFunctor(Qt3DRender::QBufferFunctorPtr(new TestFunctor(1340)));
+        indexBuffer->setDataGenerator(Qt3DRender::QBufferDataGeneratorPtr(new TestFunctor(1340)));
         indexBuffer->setSyncData(true);
         QTest::newRow("index") << indexBuffer;
     }
@@ -110,11 +110,11 @@ private Q_SLOTS:
         QCOMPARE(buffer->data(), clone->data());
         QCOMPARE(buffer->usage(), clone->usage());
         QCOMPARE(buffer->type(), clone->type());
-        QCOMPARE(buffer->bufferFunctor(), clone->bufferFunctor());
+        QCOMPARE(buffer->dataGenerator(), clone->dataGenerator());
         QCOMPARE(buffer->isSyncData(), clone->isSyncData());
-        if (buffer->bufferFunctor()) {
-            QVERIFY(clone->bufferFunctor());
-            QVERIFY(*clone->bufferFunctor() == *buffer->bufferFunctor());
+        if (buffer->dataGenerator()) {
+            QVERIFY(clone->dataGenerator());
+            QVERIFY(*clone->dataGenerator() == *buffer->dataGenerator());
         }
     }
 
@@ -161,15 +161,15 @@ private Q_SLOTS:
         arbiter.events.clear();
 
         // WHEN
-        Qt3DRender::QBufferFunctorPtr functor(new TestFunctor(355));
-        buffer->setBufferFunctor(functor);
+        Qt3DRender::QBufferDataGeneratorPtr functor(new TestFunctor(355));
+        buffer->setDataGenerator(functor);
         QCoreApplication::processEvents();
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
         change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
-        QCOMPARE(change->propertyName(), "bufferFunctor");
-        QCOMPARE(change->value().value<Qt3DRender::QBufferFunctorPtr>(), functor);
+        QCOMPARE(change->propertyName(), "dataGenerator");
+        QCOMPARE(change->value().value<Qt3DRender::QBufferDataGeneratorPtr>(), functor);
 
         arbiter.events.clear();
 
diff --git a/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp b/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp
index 51eaee7e8..063a80723 100644
--- a/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp
+++ b/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp
@@ -33,7 +33,7 @@
 #include <Qt3DRender/qgeometry.h>
 #include <Qt3DRender/qattribute.h>
 #include <Qt3DRender/qbuffer.h>
-#include <Qt3DRender/qbufferfunctor.h>
+#include <Qt3DRender/qbufferdatagenerator.h>
 
 #include <Qt3DRender/qspheremesh.h>
 #include <Qt3DRender/qcylindermesh.h>
@@ -117,11 +117,11 @@ private Q_SLOTS:
                 QCOMPARE(buffer->data(), clonedBuffer->data());
                 QCOMPARE(buffer->usage(), clonedBuffer->usage());
                 QCOMPARE(buffer->type(), clonedBuffer->type());
-                QCOMPARE(buffer->bufferFunctor(), clonedBuffer->bufferFunctor());
+                QCOMPARE(buffer->dataGenerator(), clonedBuffer->dataGenerator());
                 QCOMPARE(buffer->isSyncData(), clonedBuffer->isSyncData());
-                if (buffer->bufferFunctor()) {
-                    QVERIFY(clonedBuffer->bufferFunctor());
-                    QVERIFY(*clonedBuffer->bufferFunctor() == *buffer->bufferFunctor());
+                if (buffer->dataGenerator()) {
+                    QVERIFY(clonedBuffer->dataGenerator());
+                    QVERIFY(*clonedBuffer->dataGenerator() == *buffer->dataGenerator());
                 }
             }
         }