diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2016-04-29 11:15:05 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-01 12:18:02 +0000 |
commit | af1cf2391f45f7f09a7f9443c29f709ff29a4743 (patch) | |
tree | 1f25894a162dc179e5d8b796cb6366c52c4c6d60 /src/core/aspects/qabstractaspect.cpp | |
parent | 3da9e8d6714da3d9d6aec6932e4edae0a2135065 (diff) |
QAbstractAspect: remove cloning code path
Change-Id: I08fe3006bc7a2fb7b35d253f4356b8e6826d9935
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/aspects/qabstractaspect.cpp')
-rw-r--r-- | src/core/aspects/qabstractaspect.cpp | 34 |
1 files changed, 6 insertions, 28 deletions
diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp index 20b69e5a5..637588b15 100644 --- a/src/core/aspects/qabstractaspect.cpp +++ b/src/core/aspects/qabstractaspect.cpp @@ -59,7 +59,6 @@ QAbstractAspectPrivate::QAbstractAspectPrivate() , m_aspectManager(Q_NULLPTR) , m_jobManager(Q_NULLPTR) , m_arbiter(Q_NULLPTR) - , m_useCloning(!qEnvironmentVariableIsSet("QT3D_NO_CLONE")) { } @@ -154,29 +153,14 @@ void QAbstractAspect::registerBackendType(const QMetaObject &obj, const QBackend void QAbstractAspectPrivate::sceneNodeAdded(QSceneChangePtr &change) { - if (m_useCloning) { - QNodePropertyChangePtr propertyChange = change.staticCast<QNodePropertyChange>(); - QNodePtr nodePtr = propertyChange->value().value<QNodePtr>(); - QNode *n = nodePtr.data(); - QNodeVisitor visitor; - visitor.traverse(n, this, &QAbstractAspectPrivate::createBackendNode); - } else { - QNodeCreatedChangeBasePtr creationChange = qSharedPointerCast<QNodeCreatedChangeBase>(change); - createBackendNodeNoClone(creationChange); - } + QNodeCreatedChangeBasePtr creationChange = qSharedPointerCast<QNodeCreatedChangeBase>(change); + createBackendNodeNoClone(creationChange); } void QAbstractAspectPrivate::sceneNodeRemoved(QSceneChangePtr &change) { - if (m_useCloning) { - QNodePropertyChangePtr propertyChange = change.staticCast<QNodePropertyChange>(); - QNodePtr nodePtr = propertyChange->value().value<QNodePtr>(); - QNode *n = nodePtr.data(); - clearBackendNode(n); - } else { - QNodeDestroyedChangePtr destructionChange = qSharedPointerCast<QNodeDestroyedChange>(change); - clearBackendNodeNoClone(destructionChange); - } + QNodeDestroyedChangePtr destructionChange = qSharedPointerCast<QNodeDestroyedChange>(change); + clearBackendNodeNoClone(destructionChange); } QVariant QAbstractAspect::executeCommand(const QStringList &args) @@ -326,14 +310,8 @@ void QAbstractAspectPrivate::setRootAndCreateNodes(QEntity *rootObject, const QV m_root = rootObject; m_rootId = rootObject->id(); - // Use old method for now, unless user explicitly requests new method - if (m_useCloning) { - QNodeVisitor visitor; - visitor.traverse(rootObject, this, &QAbstractAspectPrivate::createBackendNode); - } else { - for (const auto &change : changes) - createBackendNodeNoClone(change); - } + for (const auto &change : changes) + createBackendNodeNoClone(change); } QServiceLocator *QAbstractAspectPrivate::services() const |