From fe017d37c909c3f7a059d8675e57cb6c03cf959e Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Mon, 9 May 2016 11:40:37 +0100 Subject: 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. 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 --- tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/render/qgeometryrenderer') diff --git a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp index 3f4e932be..4c2835ef2 100644 --- a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp +++ b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp @@ -281,7 +281,7 @@ private Q_SLOTS: Qt3DCore::QNodeAddedPropertyChangePtr nodeAddedChange = arbiter.events.first().staticCast(); QCOMPARE(nodeAddedChange->propertyName(), "geometry"); QCOMPARE(nodeAddedChange->addedNodeId(), geom.id()); - QCOMPARE(nodeAddedChange->type(), Qt3DCore::NodeAdded); + QCOMPARE(nodeAddedChange->type(), Qt3DCore::PropertyValueAdded); arbiter.events.clear(); @@ -295,12 +295,12 @@ private Q_SLOTS: Qt3DCore::QNodeRemovedPropertyChangePtr nodeRemovedChange = arbiter.events.first().staticCast(); QCOMPARE(nodeRemovedChange->propertyName(), "geometry"); QCOMPARE(nodeRemovedChange->removedNodeId(), geom.id()); - QCOMPARE(nodeRemovedChange->type(), Qt3DCore::NodeRemoved); + QCOMPARE(nodeRemovedChange->type(), Qt3DCore::PropertyValueRemoved); nodeAddedChange = arbiter.events.last().staticCast(); QCOMPARE(nodeAddedChange->propertyName(), "geometry"); QCOMPARE(nodeAddedChange->addedNodeId(), geom2.id()); - QCOMPARE(nodeAddedChange->type(), Qt3DCore::NodeAdded); + QCOMPARE(nodeAddedChange->type(), Qt3DCore::PropertyValueAdded); arbiter.events.clear(); } -- cgit v1.2.3