diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-05-09 11:40:37 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-10 19:08:12 +0000 |
commit | fe017d37c909c3f7a059d8675e57cb6c03cf959e (patch) | |
tree | 3dad3043ed06e56f7f10ff981934a80a91b4f5bb /src/render/geometry | |
parent | d52cfb9662a2bf193c3827b8f43a8c7ec74e953e (diff) |
Rename NodeAdded/NodeRemoved ChangeFlags
These are not just for adding/removing QNodes. They are more general
in purpose and are used for adding/removing values to/from collection
based properties e.g. QVector<MyValue>. The addition/removal of QNode
pointers (which we translate to QNodeIds) is just the most common case.
If Q_PROPERTY/QObject gains support for properties of collections and
the typical operations on them, then we will be able to catch and
handle most uses of these change types in QNodePrivate just like we do
for setting a Q_PROPERTY.
Task-number: QTBUG-51494
Change-Id: I707de1647554a61accf81dc79bfe58b289dbff7b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/geometry')
-rw-r--r-- | src/render/geometry/geometry.cpp | 4 | ||||
-rw-r--r-- | src/render/geometry/geometryrenderer.cpp | 4 | ||||
-rw-r--r-- | src/render/geometry/qgeometryrenderer.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/render/geometry/geometry.cpp b/src/render/geometry/geometry.cpp index 381256cf6..d88ffa121 100644 --- a/src/render/geometry/geometry.cpp +++ b/src/render/geometry/geometry.cpp @@ -82,7 +82,7 @@ void Geometry::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &cha void Geometry::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { - case NodeAdded: { + case PropertyValueAdded: { const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("attribute")) { m_attributes.push_back(change->addedNodeId()); @@ -91,7 +91,7 @@ void Geometry::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) break; } - case NodeRemoved: { + case PropertyValueRemoved: { const auto change = qSharedPointerCast<QNodeRemovedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("attribute")) { m_attributes.removeOne(change->removedNodeId()); diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp index bc55d2f3d..05af44b65 100644 --- a/src/render/geometry/geometryrenderer.cpp +++ b/src/render/geometry/geometryrenderer.cpp @@ -168,7 +168,7 @@ void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) break; } - case NodeAdded: { + case PropertyValueAdded: { const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("geometry")) { m_geometryId = change->addedNodeId(); @@ -177,7 +177,7 @@ void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) break; } - case NodeRemoved: { + case PropertyValueRemoved: { const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("geometry")) { m_geometryId = QNodeId(); diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp index 548409d6d..aa055e856 100644 --- a/src/render/geometry/qgeometryrenderer.cpp +++ b/src/render/geometry/qgeometryrenderer.cpp @@ -380,7 +380,7 @@ void QGeometryRenderer::setGeometry(QGeometry *geometry) return; // TODO: Investigate if we can rely upon the automatic property change notifications - // rather than having to manually send a NodeRemoved followed by a NodeAdded change. + // rather than having to manually send a PropertyValueRemoved followed by a PropertyValueAdded change. if (d->m_geometry && d->m_changeArbiter) { const auto change = QNodeRemovedPropertyChangePtr::create(id(), d->m_geometry); change->setPropertyName("geometry"); |