Strip out cloning subsystem

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

4 files changed, 16 insertions, 32 deletions

diff --git a/src/quick3d/quick3d/items/quick3dentityloader.cpp b/src/quick3d/quick3d/items/quick3dentityloader.cpp
index 0e72cba6b..119b2e66d 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader.cpp
+++ b/src/quick3d/quick3d/items/quick3dentityloader.cpp
@@ -132,15 +132,6 @@ void Quick3DEntityLoader::setSource(const QUrl &url)
     d->loadFromSource();
 }
 
-void Quick3DEntityLoader::copy(const QNode *ref)
-{
-    QNode::copy(ref);
-    const Quick3DEntityLoader *loader = static_cast<const Quick3DEntityLoader*>(ref);
-    d_func()->m_source = loader->d_func()->m_source;
-    d_func()->m_entity = static_cast<QEntity*>(QNode::clone(loader->d_func()->m_entity));
-    d_func()->m_entity->setParent(this);
-}
-
 Quick3DEntityLoaderPrivate::Quick3DEntityLoaderPrivate()
     : QEntityPrivate(),
       m_incubator(Q_NULLPTR),
diff --git a/src/quick3d/quick3d/items/quick3dentityloader_p.h b/src/quick3d/quick3d/items/quick3dentityloader_p.h
index fe470653f..928f31ada 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader_p.h
+++ b/src/quick3d/quick3d/items/quick3dentityloader_p.h
@@ -86,13 +86,9 @@ Q_SIGNALS:
     void entityChanged();
     void sourceChanged();
 
-protected:
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
-
 private:
     Q_DECLARE_PRIVATE(Quick3DEntityLoader)
     Q_PRIVATE_SLOT(d_func(), void _q_componentStatusChanged(QQmlComponent::Status))
-    QT3D_CLONEABLE(Quick3DEntityLoader)
 };
 
 } // namespace Quick
diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
index aff179f17..e9b084a3d 100644
--- a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
+++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
@@ -498,21 +498,22 @@ void Quick3DNodeInstantiator::componentComplete()
     }
 }
 
-void Quick3DNodeInstantiator::copy(const QNode *ref)
-{
-    QNode::copy(ref);
-    const Quick3DNodeInstantiator *instantiator = static_cast<const Quick3DNodeInstantiator*>(ref);
-    // We only need to clone the children as the instantiator itself has no
-    // corresponding backend node type.
-    for (int i = 0; i < instantiator->d_func()->m_objects.size(); ++i) {
-        QNode *n = qobject_cast<QNode *>(instantiator->d_func()->m_objects.at(i));
-        if (!n)
-            continue;
-        QNode *clonedNode = QNode::clone(n);
-        clonedNode->setParent(this);
-        d_func()->m_objects.append(clonedNode);
-    }
-}
+// TODO: Avoid cloning here
+//void Quick3DNodeInstantiator::copy(const QNode *ref)
+//{
+//    QNode::copy(ref);
+//    const Quick3DNodeInstantiator *instantiator = static_cast<const Quick3DNodeInstantiator*>(ref);
+//    // We only need to clone the children as the instantiator itself has no
+//    // corresponding backend node type.
+//    for (int i = 0; i < instantiator->d_func()->m_objects.size(); ++i) {
+//        QNode *n = qobject_cast<QNode *>(instantiator->d_func()->m_objects.at(i));
+//        if (!n)
+//            continue;
+//        QNode *clonedNode = QNode::clone(n);
+//        clonedNode->setParent(this);
+//        d_func()->m_objects.append(clonedNode);
+//    }
+//}
 
 } // namespace Quick
 } // namespace Qt3DCore
diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
index d1fc88147..d861fc2fe 100644
--- a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
+++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
@@ -112,11 +112,7 @@ Q_SIGNALS:
     void objectAdded(int index, QObject *object);
     void objectRemoved(int index, QObject *object);
 
-protected:
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
-
 private:
-    QT3D_CLONEABLE(Quick3DNodeInstantiator)
     Q_DISABLE_COPY(Quick3DNodeInstantiator)
     Q_DECLARE_PRIVATE(Quick3DNodeInstantiator)
     Q_PRIVATE_SLOT(d_func(), void _q_createdItem(int, QObject *))