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 /tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp | |
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 'tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp')
-rw-r--r-- | tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp index 104fd753b..7342386c8 100644 --- a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp +++ b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp @@ -64,15 +64,15 @@ public: void sendNodeAddedNotification() { - Qt3DCore::QNodePropertyChangePtr e(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, id())); - e->setPropertyName("NodeAdded"); + Qt3DCore::QNodePropertyChangePtr e(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyValueAdded, Qt3DCore::QSceneChange::Node, id())); + e->setPropertyName("PropertyValueAdded"); Qt3DCore::QNodePrivate::get(this)->notifyObservers(e); } void sendNodeRemovedNotification() { - Qt3DCore::QNodePropertyChangePtr e(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, id())); - e->setPropertyName("NodeRemoved"); + Qt3DCore::QNodePropertyChangePtr e(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyValueRemoved, Qt3DCore::QSceneChange::Node, id())); + e->setPropertyName("PropertyValueRemoved"); Qt3DCore::QNodePrivate::get(this)->notifyObservers(e); } @@ -340,7 +340,7 @@ void tst_QChangeArbiter::registerObservers() arbiter->syncChanges(); Q_FOREACH (tst_SimpleObserver *o, observers) { QCOMPARE(o->lastChanges().size(), 1); - QVERIFY(o->lastChanges().last()->type() == Qt3DCore::NodeAdded); + QVERIFY(o->lastChanges().last()->type() == Qt3DCore::PropertyValueAdded); } Qt3DCore::QChangeArbiter::destroyThreadLocalChangeQueue(arbiter.data()); @@ -394,7 +394,7 @@ void tst_QChangeArbiter::registerSceneObserver() // THEN Q_FOREACH (tst_SimpleObserver *o, observers) { QVERIFY(!o->lastChange().isNull()); - QVERIFY(o->lastChange()->type() == Qt3DCore::NodeAdded); + QVERIFY(o->lastChange()->type() == Qt3DCore::PropertyValueAdded); } Q_FOREACH (tst_SceneObserver *s, sceneObservers) { QVERIFY(!s->lastChange().isNull()); @@ -457,7 +457,7 @@ void tst_QChangeArbiter::unregisterObservers() // THEN Q_FOREACH (tst_SimpleObserver *o, observers) { QVERIFY(!o->lastChange().isNull()); - QVERIFY(o->lastChange()->type() == Qt3DCore::NodeAdded); + QVERIFY(o->lastChange()->type() == Qt3DCore::PropertyValueAdded); } // WHEN @@ -470,7 +470,7 @@ void tst_QChangeArbiter::unregisterObservers() // THEN Q_FOREACH (tst_SimpleObserver *o, observers) { QVERIFY(!o->lastChange().isNull()); - QVERIFY(o->lastChange()->type() == Qt3DCore::NodeAdded); + QVERIFY(o->lastChange()->type() == Qt3DCore::PropertyValueAdded); } Qt3DCore::QChangeArbiter::destroyThreadLocalChangeQueue(arbiter.data()); @@ -524,7 +524,7 @@ void tst_QChangeArbiter::unregisterSceneObservers() // THEN Q_FOREACH (tst_SimpleObserver *o, observers) { QVERIFY(!o->lastChange().isNull()); - QVERIFY(o->lastChange()->type() == Qt3DCore::NodeAdded); + QVERIFY(o->lastChange()->type() == Qt3DCore::PropertyValueAdded); } Q_FOREACH (tst_SceneObserver *s, sceneObservers) { QVERIFY(!s->lastChange().isNull()); @@ -552,7 +552,7 @@ void tst_QChangeArbiter::unregisterSceneObservers() // THEN Q_FOREACH (tst_SimpleObserver *o, observers) { QVERIFY(!o->lastChange().isNull()); - QVERIFY(o->lastChange()->type() == Qt3DCore::NodeRemoved); + QVERIFY(o->lastChange()->type() == Qt3DCore::PropertyValueRemoved); } Q_FOREACH (tst_SceneObserver *s, sceneObservers) { QVERIFY(!s->lastChange().isNull()); @@ -569,7 +569,7 @@ void tst_QChangeArbiter::unregisterSceneObservers() // THEN Q_FOREACH (tst_SimpleObserver *o, observers) { QVERIFY(!o->lastChange().isNull()); - QVERIFY(o->lastChange()->type() == Qt3DCore::NodeAdded); + QVERIFY(o->lastChange()->type() == Qt3DCore::PropertyValueAdded); } Q_FOREACH (tst_SceneObserver *s, sceneObservers) { QVERIFY(!s->lastChange().isNull()); @@ -605,9 +605,9 @@ void tst_QChangeArbiter::distributeFrontendChanges() tst_SimpleObserver *backendComponentRemovedObserver = new tst_SimpleObserver(); arbiter->registerObserver(backendAllChangedObserver, root->id()); - arbiter->registerObserver(backendNodeAddedObserver, root->id(), Qt3DCore::NodeAdded); + arbiter->registerObserver(backendNodeAddedObserver, root->id(), Qt3DCore::PropertyValueAdded); arbiter->registerObserver(backendNodeUpdatedObserver, root->id(), Qt3DCore::PropertyUpdated); - arbiter->registerObserver(backendNodeRemovedObserver, root->id(), Qt3DCore::NodeRemoved); + arbiter->registerObserver(backendNodeRemovedObserver, root->id(), Qt3DCore::PropertyValueRemoved); arbiter->registerObserver(backendComponentAddedObserver, root->id(), Qt3DCore::ComponentAdded); arbiter->registerObserver(backendComponentRemovedObserver, root->id(), Qt3DCore::ComponentRemoved); |