Hide deprecated functor API

Now private for QTextureGenerator and QGeometryFactory updates.
QTextureImageDataGenerator remains for now as it was not previously
deprecated and, mainly, it's the only API to get data into an image.
Consequently, QAbstractFunctor has been un-deprecated.

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

4 files changed, 2 insertions, 98 deletions

diff --git a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp
index 19df24680..111b0a3ba 100644
--- a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp
+++ b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp
@@ -35,35 +35,8 @@ QT_WARNING_DISABLE_DEPRECATED
 #include <Qt3DRender/private/geometryrenderer_p.h>
 #include <Qt3DRender/private/geometryrenderermanager_p.h>
 #include <Qt3DRender/qgeometry.h>
-#include <Qt3DRender/qgeometryfactory.h>
 #include "testrenderer.h"
 
-class TestFactory : public Qt3DRender::QGeometryFactory
-{
-public:
-    explicit TestFactory(int size)
-        : m_size(size)
-    {}
-
-    Qt3DRender::QGeometry *operator ()() final
-    {
-        return nullptr;
-    }
-
-    bool operator ==(const Qt3DRender::QGeometryFactory &other) const final
-    {
-        const TestFactory *otherFactory = Qt3DRender::functor_cast<TestFactory>(&other);
-        if (otherFactory != nullptr)
-            return otherFactory->m_size == m_size;
-        return false;
-    }
-
-    QT3D_FUNCTOR(TestFactory)
-
-    private:
-        int m_size;
-};
-
 class DummyGeometry : public Qt3DRender::QGeometry
 {
     Q_OBJECT
@@ -85,7 +58,6 @@ private Q_SLOTS:
         Qt3DRender::Render::GeometryRenderer renderGeometryRenderer;
         Qt3DRender::QGeometryRenderer geometryRenderer;
         Qt3DRender::QGeometry geometry;
-        Qt3DRender::QGeometryFactoryPtr factory(new TestFactory(1200));
         Qt3DRender::Render::GeometryRendererManager geometryRendererManager;
         TestRenderer renderer;
 
@@ -98,7 +70,6 @@ private Q_SLOTS:
         geometryRenderer.setPrimitiveRestartEnabled(true);
         geometryRenderer.setPrimitiveType(Qt3DRender::QGeometryRenderer::Patches);
         geometryRenderer.setGeometry(&geometry);
-        geometryRenderer.setGeometryFactory(factory);
         geometryRenderer.setEnabled(false);
 
         // WHEN
@@ -118,9 +89,7 @@ private Q_SLOTS:
         QCOMPARE(renderGeometryRenderer.primitiveRestartEnabled(), geometryRenderer.primitiveRestartEnabled());
         QCOMPARE(renderGeometryRenderer.primitiveType(), geometryRenderer.primitiveType());
         QCOMPARE(renderGeometryRenderer.geometryId(), geometry.id());
-        QCOMPARE(renderGeometryRenderer.geometryFactory(), factory);
         QCOMPARE(renderGeometryRenderer.isEnabled(), false);
-        QVERIFY(*renderGeometryRenderer.geometryFactory() == *factory);
     }
 
     void checkInitialAndCleanedUpState()
@@ -147,7 +116,6 @@ private Q_SLOTS:
         // GIVEN
         Qt3DRender::QGeometryRenderer geometryRenderer;
         Qt3DRender::QGeometry geometry;
-        Qt3DRender::QGeometryFactoryPtr factory(new TestFactory(1200));
         TestRenderer renderer;
 
         geometryRenderer.setInstanceCount(454);
@@ -159,7 +127,6 @@ private Q_SLOTS:
         geometryRenderer.setPrimitiveRestartEnabled(true);
         geometryRenderer.setPrimitiveType(Qt3DRender::QGeometryRenderer::Patches);
         geometryRenderer.setGeometry(&geometry);
-        geometryRenderer.setGeometryFactory(factory);
         geometryRenderer.setEnabled(true);
 
         // WHEN
@@ -179,7 +146,6 @@ private Q_SLOTS:
         QCOMPARE(renderGeometryRenderer.restartIndexValue(), -1);
         QCOMPARE(renderGeometryRenderer.primitiveRestartEnabled(), false);
         QCOMPARE(renderGeometryRenderer.primitiveType(), Qt3DRender::QGeometryRenderer::Triangles);
-        QVERIFY(renderGeometryRenderer.geometryFactory().isNull());
         QVERIFY(!renderGeometryRenderer.isEnabled());
     }
 
@@ -305,30 +271,6 @@ private Q_SLOTS:
         QVERIFY(!backEndRenderer.isDirty());
 
         // WHEN
-        Qt3DRender::QGeometryFactoryPtr factory(new TestFactory(1450));
-        frontEndRenderer.setGeometryFactory(factory);
-        backEndRenderer.syncFromFrontEnd(&frontEndRenderer, false);
-
-        // THEN
-        QCOMPARE(backEndRenderer.geometryFactory(), factory);
-        QVERIFY(backEndRenderer.isDirty());
-
-        QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::GeometryDirty);
-        renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty);
-
-        backEndRenderer.unsetDirty();
-        QVERIFY(!backEndRenderer.isDirty());
-
-        // WHEN we set an identical factory again
-        Qt3DRender::QGeometryFactoryPtr factory2(new TestFactory(1450));
-        frontEndRenderer.setGeometryFactory(factory2);
-        backEndRenderer.syncFromFrontEnd(&frontEndRenderer, false);
-
-        // THEN not dirty and still uses original factory
-        QCOMPARE(backEndRenderer.geometryFactory(), factory);
-        QVERIFY(!backEndRenderer.isDirty());
-
-        // WHEN
         DummyGeometry geometry;
         const Qt3DCore::QNodeId geometryId = geometry.id();
         frontEndRenderer.setGeometry(&geometry);
diff --git a/tests/auto/render/meshfunctors/tst_meshfunctors.cpp b/tests/auto/render/meshfunctors/tst_meshfunctors.cpp
index f8110085b..e8dfaa2cb 100644
--- a/tests/auto/render/meshfunctors/tst_meshfunctors.cpp
+++ b/tests/auto/render/meshfunctors/tst_meshfunctors.cpp
@@ -32,7 +32,7 @@ QT_WARNING_DISABLE_DEPRECATED
 
 #include <QtTest/QtTest>
 #include <Qt3DCore/qcomponent.h>
-#include <Qt3DRender/qgeometryfactory.h>
+#include <Qt3DRender/private/qgeometryfactory_p.h>
 #include <Qt3DRender/qgeometry.h>
 #include <Qt3DRender/qmesh.h>
 #include <Qt3DRender/private/qmesh_p.h>
diff --git a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
index 1c2d30b49..76f913af7 100644
--- a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
+++ b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
@@ -35,7 +35,6 @@ QT_WARNING_DISABLE_DEPRECATED
 #include <Qt3DCore/private/qscene_p.h>
 
 #include <Qt3DRender/qgeometryrenderer.h>
-#include <Qt3DRender/qgeometryfactory.h>
 #include <Qt3DRender/qgeometry.h>
 #include <Qt3DRender/qattribute.h>
 #include <Qt3DRender/qbuffer.h>
@@ -43,32 +42,6 @@ QT_WARNING_DISABLE_DEPRECATED
 
 #include "testarbiter.h"
 
-class TestFactory : public Qt3DRender::QGeometryFactory
-{
-public:
-    explicit TestFactory(int size)
-        : m_size(size)
-    {}
-
-    Qt3DRender::QGeometry *operator ()() final
-    {
-        return nullptr;
-    }
-
-    bool operator ==(const Qt3DRender::QGeometryFactory &other) const final
-    {
-        const TestFactory *otherFactory = Qt3DRender::functor_cast<TestFactory>(&other);
-        if (otherFactory != nullptr)
-            return otherFactory->m_size == m_size;
-        return false;
-    }
-
-    QT3D_FUNCTOR(TestFactory)
-
-private:
-    int m_size;
-};
-
 class tst_QGeometryRenderer: public QObject
 {
     Q_OBJECT
@@ -173,17 +146,6 @@ private Q_SLOTS:
         arbiter.clear();
 
         // WHEN
-        Qt3DRender::QGeometryFactoryPtr factory(new TestFactory(555));
-        geometryRenderer->setGeometryFactory(factory);
-        QCoreApplication::processEvents();
-
-        // THEN
-        QCOMPARE(arbiter.dirtyNodes().size(), 1);
-        QCOMPARE(arbiter.dirtyNodes().front(), geometryRenderer.data());
-
-        arbiter.clear();
-
-        // WHEN
         Qt3DRender::QGeometry geom;
         geometryRenderer->setGeometry(&geom);
         QCoreApplication::processEvents();
diff --git a/tests/auto/render/qmesh/tst_qmesh.cpp b/tests/auto/render/qmesh/tst_qmesh.cpp
index cc66316ae..16545046d 100644
--- a/tests/auto/render/qmesh/tst_qmesh.cpp
+++ b/tests/auto/render/qmesh/tst_qmesh.cpp
@@ -192,7 +192,7 @@ private Q_SLOTS:
         mesh.setSource(QUrl(QStringLiteral("some_path")));
 
         // THEN
-        QVERIFY(!mesh.geometryFactory().isNull());
+        QVERIFY(!Qt3DRender::QMeshPrivate::get(&mesh)->m_geometryFactory.isNull());
     }
 };