diff options
| -rw-r--r-- | src/core/qchangearbiter.cpp | 3 | ||||
| -rw-r--r-- | src/core/qnodepropertychangebase_p.h | 2 | ||||
| -rw-r--r-- | src/core/qscenechange.cpp | 1 | ||||
| -rw-r--r-- | src/core/qscenechange.h | 13 | ||||
| -rw-r--r-- | src/render/backend/entity.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp | 2 |
6 files changed, 10 insertions, 13 deletions
diff --git a/src/core/qchangearbiter.cpp b/src/core/qchangearbiter.cpp index 34a9518d8..0cec96a42 100644 --- a/src/core/qchangearbiter.cpp +++ b/src/core/qchangearbiter.cpp @@ -118,8 +118,7 @@ void QChangeArbiter::distributeQueueChanges(QChangeQueue *changeQueue) if (change->type() == NodeCreated) { for (QSceneObserverInterface *observer : qAsConst(m_sceneObservers)) observer->sceneNodeAdded(change); - } - else if (change->type() == NodeAboutToBeDeleted || change->type() == NodeDeleted) { + } else if (change->type() == NodeDeleted) { for (QSceneObserverInterface *observer : qAsConst(m_sceneObservers)) observer->sceneNodeRemoved(change); } diff --git a/src/core/qnodepropertychangebase_p.h b/src/core/qnodepropertychangebase_p.h index 9dba47960..1f65f3bdf 100644 --- a/src/core/qnodepropertychangebase_p.h +++ b/src/core/qnodepropertychangebase_p.h @@ -68,7 +68,7 @@ public: Q_DECLARE_PUBLIC(QNodePropertyChangeBase) - /// FIXME: use QMetaProperty here once the NodeAboutToBeDeleted etc. change events + /// FIXME: use QMetaProperty here once the NodeDeleted etc. change events /// get refactored to their own QSceneChange subclass const char *m_propertyName; }; diff --git a/src/core/qscenechange.cpp b/src/core/qscenechange.cpp index ee6a5ab63..096080411 100644 --- a/src/core/qscenechange.cpp +++ b/src/core/qscenechange.cpp @@ -52,7 +52,6 @@ namespace Qt3DCore { * The types of change that can be sent and received by Qt3D's change notification system. * * \value NodeCreated A new instance of a QNode subclass has been created. - * \value NodeAboutToBeDeleted A QNode is about to be deleted from the scene. * \value NodeDeleted A QNode has been deleted. * \value NodeUpdated A QNode property has been updated. * \value NodeAdded A QNode has been added to the scene. diff --git a/src/core/qscenechange.h b/src/core/qscenechange.h index a5a36cac9..1e145ec75 100644 --- a/src/core/qscenechange.h +++ b/src/core/qscenechange.h @@ -50,13 +50,12 @@ namespace Qt3DCore { enum ChangeFlag { NodeCreated = 1 << 0, - NodeAboutToBeDeleted = 1 << 1, - NodeDeleted = 1 << 2, - NodeUpdated = 1 << 3, - NodeAdded = 1 << 4, - NodeRemoved = 1 << 5, - ComponentAdded = 1 << 6, - ComponentRemoved = 1 << 7, + NodeDeleted = 1 << 1, + NodeUpdated = 1 << 2, + NodeAdded = 1 << 3, + NodeRemoved = 1 << 4, + ComponentAdded = 1 << 5, + ComponentRemoved = 1 << 6, AllChanges = 0xFFFFFFFF }; Q_DECLARE_FLAGS(ChangeFlags, ChangeFlag) diff --git a/src/render/backend/entity.cpp b/src/render/backend/entity.cpp index 5de5d44da..696649fd3 100644 --- a/src/render/backend/entity.cpp +++ b/src/render/backend/entity.cpp @@ -100,7 +100,7 @@ void Entity::cleanup() } m_worldTransform = HMatrix(); // Release all component will have to perform their own release when they receive the - // NodeDeleted/NodeAboutToBeDeleted notification + // NodeDeleted notification // Clear components m_transformComponent = Qt3DCore::QNodeId(); m_cameraComponent = Qt3DCore::QNodeId(); diff --git a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp index 69eb89e6e..a2476a2aa 100644 --- a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp +++ b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp @@ -286,7 +286,7 @@ public: void sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e) { QVERIFY(!e.isNull()); - QVERIFY((e->type() == Qt3DCore::NodeDeleted || e->type() == Qt3DCore::NodeAboutToBeDeleted)); + QVERIFY((e->type() == Qt3DCore::NodeDeleted)); m_lastChange = e; } |