diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-05-09 11:35:22 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-10 19:08:08 +0000 |
commit | d52cfb9662a2bf193c3827b8f43a8c7ec74e953e (patch) | |
tree | e0745409bdafcec7ef96dbc7f506ac6704eabd0a /tests | |
parent | ccb460bf3d6ea393bc114bc571c12875a37465f2 (diff) |
Rename NodeUpdated ChangeFlag to PropertyUpdated
This more correctly reflects the semantic meaning.
Task-number: QTBUG-51494
Change-Id: I3a230e959ea007f1d19808eae73b5d95b6f06514
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests')
30 files changed, 109 insertions, 109 deletions
diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp index 00293086f..2a8714f5c 100644 --- a/tests/auto/core/nodes/tst_nodes.cpp +++ b/tests/auto/core/nodes/tst_nodes.cpp @@ -858,7 +858,7 @@ void tst_Nodes::changeCustomProperty() QCOMPARE(spy.events.size(), 1); QVERIFY(spy.events.first().wasLocked()); Qt3DCore::QNodePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QNodePropertyChange>(); - QCOMPARE(event->type(), Qt3DCore::NodeUpdated); + QCOMPARE(event->type(), Qt3DCore::PropertyUpdated); QCOMPARE(event->propertyName(), "customProperty"); QCOMPARE(event->value().toString(), QString("foo")); } diff --git a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp index a2476a2aa..104fd753b 100644 --- a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp +++ b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp @@ -78,8 +78,8 @@ public: void sendNodeUpdatedNotification() { - Qt3DCore::QNodePropertyChangePtr e(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, id())); - e->setPropertyName("NodeUpdated"); + Qt3DCore::QNodePropertyChangePtr e(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, id())); + e->setPropertyName("PropertyUpdated"); Qt3DCore::QNodePrivate::get(this)->notifyObservers(e); } @@ -606,7 +606,7 @@ void tst_QChangeArbiter::distributeFrontendChanges() arbiter->registerObserver(backendAllChangedObserver, root->id()); arbiter->registerObserver(backendNodeAddedObserver, root->id(), Qt3DCore::NodeAdded); - arbiter->registerObserver(backendNodeUpdatedObserver, root->id(), Qt3DCore::NodeUpdated); + arbiter->registerObserver(backendNodeUpdatedObserver, root->id(), Qt3DCore::PropertyUpdated); arbiter->registerObserver(backendNodeRemovedObserver, root->id(), Qt3DCore::NodeRemoved); arbiter->registerObserver(backendComponentAddedObserver, root->id(), Qt3DCore::ComponentAdded); arbiter->registerObserver(backendComponentRemovedObserver, root->id(), Qt3DCore::ComponentRemoved); @@ -770,7 +770,7 @@ void tst_QChangeArbiter::distributeBackendChanges() QVERIFY(c->subjectId() == root->id()); qDebug() << c->propertyName(); QVERIFY(strcmp(c->propertyName(), "Reply") == 0); - QVERIFY(c->type() == Qt3DCore::NodeUpdated); + QVERIFY(c->type() == Qt3DCore::PropertyUpdated); answer->exit(); answer->wait(); diff --git a/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp b/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp index 441e2aee7..ef4db322b 100644 --- a/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp +++ b/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp @@ -121,7 +121,7 @@ private Q_SLOTS: DummyAxisInputBackend backendAxisInput; // WHEN - Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("enabled"); updateChange->setValue(true); backendAxisInput.sceneChangeEvent(updateChange); @@ -131,7 +131,7 @@ private Q_SLOTS: // WHEN TestDevice device; - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("sourceDevice"); updateChange->setValue(QVariant::fromValue(device.id())); backendAxisInput.sceneChangeEvent(updateChange); diff --git a/tests/auto/input/action/tst_action.cpp b/tests/auto/input/action/tst_action.cpp index f74491af4..ee1e545e5 100644 --- a/tests/auto/input/action/tst_action.cpp +++ b/tests/auto/input/action/tst_action.cpp @@ -113,7 +113,7 @@ private Q_SLOTS: Qt3DCore::QNodePropertyChangePtr updateChange; // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("enabled"); updateChange->setValue(true); backendAction.sceneChangeEvent(updateChange); diff --git a/tests/auto/input/analogaxisinput/tst_analogaxisinput.cpp b/tests/auto/input/analogaxisinput/tst_analogaxisinput.cpp index 8a9d02d3b..c15dded44 100644 --- a/tests/auto/input/analogaxisinput/tst_analogaxisinput.cpp +++ b/tests/auto/input/analogaxisinput/tst_analogaxisinput.cpp @@ -96,7 +96,7 @@ private Q_SLOTS: Qt3DInput::Input::AnalogAxisInput backendAxisInput; // WHEN - Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(32); updateChange->setPropertyName("axis"); backendAxisInput.sceneChangeEvent(updateChange); @@ -105,7 +105,7 @@ private Q_SLOTS: QCOMPARE(backendAxisInput.axis(), 32); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("enabled"); updateChange->setValue(true); backendAxisInput.sceneChangeEvent(updateChange); @@ -115,7 +115,7 @@ private Q_SLOTS: // WHEN TestDevice device; - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("sourceDevice"); updateChange->setValue(QVariant::fromValue(device.id())); backendAxisInput.sceneChangeEvent(updateChange); diff --git a/tests/auto/input/axis/tst_axis.cpp b/tests/auto/input/axis/tst_axis.cpp index 552ca4855..6efc1cf2c 100644 --- a/tests/auto/input/axis/tst_axis.cpp +++ b/tests/auto/input/axis/tst_axis.cpp @@ -114,7 +114,7 @@ private Q_SLOTS: Qt3DCore::QNodePropertyChangePtr updateChange; // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("enabled"); updateChange->setValue(true); backendAxis.sceneChangeEvent(updateChange); diff --git a/tests/auto/input/buttonaxisinput/tst_buttonaxisinput.cpp b/tests/auto/input/buttonaxisinput/tst_buttonaxisinput.cpp index 98f3a2545..82dff8418 100644 --- a/tests/auto/input/buttonaxisinput/tst_buttonaxisinput.cpp +++ b/tests/auto/input/buttonaxisinput/tst_buttonaxisinput.cpp @@ -101,7 +101,7 @@ private Q_SLOTS: Qt3DInput::Input::ButtonAxisInput backendAxisInput; // WHEN - Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(QVariant::fromValue(QVector<int>() << 64)); updateChange->setPropertyName("buttons"); backendAxisInput.sceneChangeEvent(updateChange); @@ -110,7 +110,7 @@ private Q_SLOTS: QCOMPARE(backendAxisInput.buttons(), QVector<int>() << 64); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(0.5f); updateChange->setPropertyName("scale"); backendAxisInput.sceneChangeEvent(updateChange); @@ -119,7 +119,7 @@ private Q_SLOTS: QCOMPARE(backendAxisInput.scale(), 0.5f); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("enabled"); updateChange->setValue(true); backendAxisInput.sceneChangeEvent(updateChange); @@ -129,7 +129,7 @@ private Q_SLOTS: // WHEN TestDevice device; - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("sourceDevice"); updateChange->setValue(QVariant::fromValue(device.id())); backendAxisInput.sceneChangeEvent(updateChange); diff --git a/tests/auto/input/qabstractaxisinput/tst_qabstractaxisinput.cpp b/tests/auto/input/qabstractaxisinput/tst_qabstractaxisinput.cpp index 454a8690e..ff81ec437 100644 --- a/tests/auto/input/qabstractaxisinput/tst_qabstractaxisinput.cpp +++ b/tests/auto/input/qabstractaxisinput/tst_qabstractaxisinput.cpp @@ -78,7 +78,7 @@ private Q_SLOTS: Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "sourceDevice"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), device->id()); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); } diff --git a/tests/auto/input/qaction/tst_qaction.cpp b/tests/auto/input/qaction/tst_qaction.cpp index 063d0e499..acfded98c 100644 --- a/tests/auto/input/qaction/tst_qaction.cpp +++ b/tests/auto/input/qaction/tst_qaction.cpp @@ -144,7 +144,7 @@ private Q_SLOTS: // Note: simulate backend change to frontend // WHEN - Qt3DCore::QNodePropertyChangePtr valueChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr valueChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); valueChange->setPropertyName("active"); valueChange->setValue(true); sceneChangeEvent(valueChange); diff --git a/tests/auto/input/qactioninput/tst_qactioninput.cpp b/tests/auto/input/qactioninput/tst_qactioninput.cpp index 598489e83..34e46cff0 100644 --- a/tests/auto/input/qactioninput/tst_qactioninput.cpp +++ b/tests/auto/input/qactioninput/tst_qactioninput.cpp @@ -107,7 +107,7 @@ private Q_SLOTS: Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "buttons"); QCOMPARE(change->value().value<QVector<int>>(), buttons); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -124,7 +124,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "sourceDevice"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), device->id()); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); } diff --git a/tests/auto/input/qanalogaxisinput/tst_qanalogaxisinput.cpp b/tests/auto/input/qanalogaxisinput/tst_qanalogaxisinput.cpp index db34a37bf..59b5abd5c 100644 --- a/tests/auto/input/qanalogaxisinput/tst_qanalogaxisinput.cpp +++ b/tests/auto/input/qanalogaxisinput/tst_qanalogaxisinput.cpp @@ -103,7 +103,7 @@ private Q_SLOTS: Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "axis"); QCOMPARE(change->value().toInt(), 350); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -120,7 +120,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "sourceDevice"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), device->id()); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); } diff --git a/tests/auto/input/qaxis/tst_qaxis.cpp b/tests/auto/input/qaxis/tst_qaxis.cpp index 156814d5c..64ad3ea69 100644 --- a/tests/auto/input/qaxis/tst_qaxis.cpp +++ b/tests/auto/input/qaxis/tst_qaxis.cpp @@ -141,7 +141,7 @@ private Q_SLOTS: // Note: simulate backend change to frontend // WHEN - Qt3DCore::QNodePropertyChangePtr valueChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr valueChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); valueChange->setPropertyName("value"); valueChange->setValue(383.0f); sceneChangeEvent(valueChange); diff --git a/tests/auto/input/qbuttonaxisinput/tst_qbuttonaxisinput.cpp b/tests/auto/input/qbuttonaxisinput/tst_qbuttonaxisinput.cpp index 953605e71..742eb709e 100644 --- a/tests/auto/input/qbuttonaxisinput/tst_qbuttonaxisinput.cpp +++ b/tests/auto/input/qbuttonaxisinput/tst_qbuttonaxisinput.cpp @@ -107,7 +107,7 @@ private Q_SLOTS: Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "buttons"); QCOMPARE(change->value().value<QVector<int>>(), buttons); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -120,7 +120,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "scale"); QCOMPARE(change->value().toFloat(), 1340.0f); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -137,7 +137,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "sourceDevice"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), device->id()); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); } diff --git a/tests/auto/render/attribute/tst_attribute.cpp b/tests/auto/render/attribute/tst_attribute.cpp index 89175ceeb..542effe43 100644 --- a/tests/auto/render/attribute/tst_attribute.cpp +++ b/tests/auto/render/attribute/tst_attribute.cpp @@ -137,7 +137,7 @@ private Q_SLOTS: QVERIFY(!renderAttribute.isDirty()); // WHEN - Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(static_cast<int>(Qt3DRender::QAttribute::Int)); updateChange->setPropertyName("vertexBaseType"); renderAttribute.sceneChangeEvent(updateChange); @@ -153,7 +153,7 @@ private Q_SLOTS: QVERIFY(!renderer.dirtyBits()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(3); updateChange->setPropertyName("vertexSize"); renderAttribute.sceneChangeEvent(updateChange); @@ -168,7 +168,7 @@ private Q_SLOTS: QVERIFY(!renderAttribute.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(static_cast<int>(Qt3DRender::QAttribute::IndexAttribute)); updateChange->setPropertyName("attributeType"); renderAttribute.sceneChangeEvent(updateChange); @@ -183,7 +183,7 @@ private Q_SLOTS: QVERIFY(!renderAttribute.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(1340); updateChange->setPropertyName("count"); renderAttribute.sceneChangeEvent(updateChange); @@ -198,7 +198,7 @@ private Q_SLOTS: QVERIFY(!renderAttribute.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(QStringLiteral("L88")); updateChange->setPropertyName("name"); renderAttribute.sceneChangeEvent(updateChange); @@ -213,7 +213,7 @@ private Q_SLOTS: QVERIFY(!renderAttribute.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(555); updateChange->setPropertyName("byteOffset"); renderAttribute.sceneChangeEvent(updateChange); @@ -228,7 +228,7 @@ private Q_SLOTS: QVERIFY(!renderAttribute.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(454); updateChange->setPropertyName("byteStride"); renderAttribute.sceneChangeEvent(updateChange); @@ -243,7 +243,7 @@ private Q_SLOTS: QVERIFY(!renderAttribute.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(1450); updateChange->setPropertyName("divisor"); renderAttribute.sceneChangeEvent(updateChange); @@ -258,7 +258,7 @@ private Q_SLOTS: QVERIFY(!renderAttribute.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); Qt3DCore::QNodeId bufferId = Qt3DCore::QNodeId::createId(); updateChange->setValue(QVariant::fromValue(bufferId)); updateChange->setPropertyName("buffer"); diff --git a/tests/auto/render/buffer/tst_buffer.cpp b/tests/auto/render/buffer/tst_buffer.cpp index 13c76ae31..0481752f1 100644 --- a/tests/auto/render/buffer/tst_buffer.cpp +++ b/tests/auto/render/buffer/tst_buffer.cpp @@ -137,7 +137,7 @@ private Q_SLOTS: QVERIFY(!renderBuffer.isDirty()); // WHEN - Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(static_cast<int>(Qt3DRender::QBuffer::IndexBuffer)); updateChange->setPropertyName("type"); renderBuffer.sceneChangeEvent(updateChange); @@ -151,7 +151,7 @@ private Q_SLOTS: QVERIFY(!renderBuffer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(static_cast<int>(Qt3DRender::QBuffer::DynamicRead)); updateChange->setPropertyName("usage"); renderBuffer.sceneChangeEvent(updateChange); @@ -164,7 +164,7 @@ private Q_SLOTS: QVERIFY(!renderBuffer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(QByteArrayLiteral("LS9")); updateChange->setPropertyName("data"); renderBuffer.sceneChangeEvent(updateChange); @@ -180,7 +180,7 @@ private Q_SLOTS: // WHEN Qt3DRender::QBufferDataGeneratorPtr functor(new TestFunctor(355)); - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(QVariant::fromValue(functor)); updateChange->setPropertyName("dataGenerator"); renderBuffer.sceneChangeEvent(updateChange); @@ -193,7 +193,7 @@ private Q_SLOTS: QVERIFY(!renderBuffer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(true); updateChange->setPropertyName("syncData"); renderBuffer.sceneChangeEvent(updateChange); diff --git a/tests/auto/render/geometry/tst_geometry.cpp b/tests/auto/render/geometry/tst_geometry.cpp index 1d84b85ff..cee86b8b6 100644 --- a/tests/auto/render/geometry/tst_geometry.cpp +++ b/tests/auto/render/geometry/tst_geometry.cpp @@ -149,7 +149,7 @@ private Q_SLOTS: // WHEN const Qt3DCore::QNodeId boundingAttrId = Qt3DCore::QNodeId::createId(); - Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(QVariant::fromValue(boundingAttrId)); updateChange->setPropertyName("boundingVolumePositionAttribute"); renderGeometry.sceneChangeEvent(updateChange); diff --git a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp index efc687dda..0a28d5069 100644 --- a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp +++ b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp @@ -183,7 +183,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("instanceCount"); updateChange->setValue(2); renderGeometryRenderer.sceneChangeEvent(updateChange); @@ -197,7 +197,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("vertexCount"); updateChange->setValue(56); renderGeometryRenderer.sceneChangeEvent(updateChange); @@ -210,7 +210,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("indexOffset"); updateChange->setValue(65); renderGeometryRenderer.sceneChangeEvent(updateChange); @@ -223,7 +223,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("firstInstance"); updateChange->setValue(82); renderGeometryRenderer.sceneChangeEvent(updateChange); @@ -236,7 +236,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("restartIndexValue"); updateChange->setValue(46); renderGeometryRenderer.sceneChangeEvent(updateChange); @@ -249,7 +249,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("primitiveRestartEnabled"); updateChange->setValue(true); renderGeometryRenderer.sceneChangeEvent(updateChange); @@ -262,7 +262,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("primitiveType"); updateChange->setValue(static_cast<int>(Qt3DRender::QGeometryRenderer::LineLoop)); renderGeometryRenderer.sceneChangeEvent(updateChange); @@ -275,7 +275,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("geometryFactory"); Qt3DRender::QGeometryFactoryPtr factory(new TestFactory(1450)); updateChange->setValue(QVariant::fromValue(factory)); @@ -316,7 +316,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(QVariant::fromValue(true)); updateChange->setPropertyName("enabled"); renderGeometryRenderer.sceneChangeEvent(updateChange); diff --git a/tests/auto/render/material/tst_material.cpp b/tests/auto/render/material/tst_material.cpp index 4a037e76f..7e50b6a91 100644 --- a/tests/auto/render/material/tst_material.cpp +++ b/tests/auto/render/material/tst_material.cpp @@ -164,7 +164,7 @@ void tst_RenderMaterial::shouldHandleEnablePropertyChange() backend.setRenderer(&renderer); // WHEN - QNodePropertyChangePtr updateChange(new QNodePropertyChange(NodeUpdated, QSceneChange::Node, QNodeId())); + QNodePropertyChangePtr updateChange(new QNodePropertyChange(PropertyUpdated, QSceneChange::Node, QNodeId())); updateChange->setValue(true); updateChange->setPropertyName("enabled"); backend.sceneChangeEvent(updateChange); @@ -174,7 +174,7 @@ void tst_RenderMaterial::shouldHandleEnablePropertyChange() QVERIFY(renderer.dirtyBits() != 0); // WHEN - QNodePropertyChangePtr secondUpdateChange(new QNodePropertyChange(NodeUpdated, QSceneChange::Node, QNodeId())); + QNodePropertyChangePtr secondUpdateChange(new QNodePropertyChange(PropertyUpdated, QSceneChange::Node, QNodeId())); secondUpdateChange->setValue(false); secondUpdateChange->setPropertyName("enabled"); backend.sceneChangeEvent(secondUpdateChange); @@ -192,7 +192,7 @@ void tst_RenderMaterial::shouldHandleEffectPropertyChange() backend.setRenderer(&renderer); // WHEN - QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); Qt3DCore::QNodeId effectId = Qt3DCore::QNodeId::createId(); updateChange->setValue(QVariant::fromValue(effectId)); updateChange->setPropertyName("effect"); diff --git a/tests/auto/render/objectpicker/tst_objectpicker.cpp b/tests/auto/render/objectpicker/tst_objectpicker.cpp index abe80a967..224f2f32c 100644 --- a/tests/auto/render/objectpicker/tst_objectpicker.cpp +++ b/tests/auto/render/objectpicker/tst_objectpicker.cpp @@ -90,7 +90,7 @@ private Q_SLOTS: QVERIFY(!objectPicker.isDirty()); // WHEN - Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(true); updateChange->setPropertyName("hoverEnabled"); objectPicker.sceneChangeEvent(updateChange); diff --git a/tests/auto/render/qabstractlight/tst_qabstractlight.cpp b/tests/auto/render/qabstractlight/tst_qabstractlight.cpp index b8f897698..aa8599432 100644 --- a/tests/auto/render/qabstractlight/tst_qabstractlight.cpp +++ b/tests/auto/render/qabstractlight/tst_qabstractlight.cpp @@ -157,12 +157,12 @@ private Q_SLOTS: QCOMPARE(change->propertyName(), "color"); QCOMPARE(change->subjectId(), light->id()); QCOMPARE(change->value().value<QColor>(), QColor(Qt::red)); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); change = lightArbiter.events[1].staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "intensity"); QCOMPARE(change->subjectId(), light->id()); QCOMPARE(change->value().value<float>(), 0.5f); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); lightArbiter.events.clear(); @@ -193,22 +193,22 @@ private Q_SLOTS: QCOMPARE(change->propertyName(), "color"); QCOMPARE(change->subjectId(), pointLight->id()); QCOMPARE(change->value().value<QColor>(), QColor(Qt::green)); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); change = pointLightArbiter.events[1].staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "intensity"); QCOMPARE(change->subjectId(), pointLight->id()); QCOMPARE(change->value().value<float>(), 0.5f); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); change = pointLightArbiter.events[2].staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "constantAttenuation"); QCOMPARE(change->subjectId(), pointLight->id()); QCOMPARE(change->value().value<float>(), 0.5f); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); change = pointLightArbiter.events[3].staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "quadraticAttenuation"); QCOMPARE(change->subjectId(), pointLight->id()); QCOMPARE(change->value().value<float>(), 1.0f); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); pointLightArbiter.events.clear(); } @@ -230,17 +230,17 @@ private Q_SLOTS: QCOMPARE(change->propertyName(), "color"); QCOMPARE(change->subjectId(), dirLight->id()); QCOMPARE(change->value().value<QColor>(), QColor(Qt::blue)); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); change = dirLightArbiter.events[1].staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "intensity"); QCOMPARE(change->subjectId(), dirLight->id()); QCOMPARE(change->value().value<float>(), 0.5f); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); change = dirLightArbiter.events[2].staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "worldDirection"); QCOMPARE(change->subjectId(), dirLight->id()); QCOMPARE(change->value().value<QVector3D>(), QVector3D(0.5f, 0.0f, -1.0f)); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); dirLightArbiter.events.clear(); } @@ -263,22 +263,22 @@ private Q_SLOTS: QCOMPARE(change->propertyName(), "color"); QCOMPARE(change->subjectId(), spotLight->id()); QCOMPARE(change->value().value<QColor>(), QColor(Qt::lightGray)); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); change = spotLightArbiter.events[1].staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "intensity"); QCOMPARE(change->subjectId(), spotLight->id()); QCOMPARE(change->value().value<float>(), 0.5f); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); change = spotLightArbiter.events[2].staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "localDirection"); QCOMPARE(change->subjectId(), spotLight->id()); QCOMPARE(change->value().value<QVector3D>(), QVector3D(0.5f, 0.0f, -1.0f)); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); change = spotLightArbiter.events[3].staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "cutOffAngle"); QCOMPARE(change->subjectId(), spotLight->id()); QCOMPARE(change->value().value<float>(), 0.75f); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); spotLightArbiter.events.clear(); } diff --git a/tests/auto/render/qattribute/tst_qattribute.cpp b/tests/auto/render/qattribute/tst_qattribute.cpp index 7c05927f2..2d143a00c 100644 --- a/tests/auto/render/qattribute/tst_qattribute.cpp +++ b/tests/auto/render/qattribute/tst_qattribute.cpp @@ -127,7 +127,7 @@ private Q_SLOTS: Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "vertexBaseType"); QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DRender::QAttribute::Double)); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -140,7 +140,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "vertexSize"); QCOMPARE(change->value().value<uint>(), 4U); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -153,7 +153,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "name"); QCOMPARE(change->value().value<QString>(), QStringLiteral("Duntov")); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -166,7 +166,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "count"); QCOMPARE(change->value().value<uint>(), 883U); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -179,7 +179,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "byteStride"); QCOMPARE(change->value().value<uint>(), 1340U); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -192,7 +192,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "byteOffset"); QCOMPARE(change->value().value<uint>(), 1584U); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -205,7 +205,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "divisor"); QCOMPARE(change->value().value<uint>(), 1450U); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -218,7 +218,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "attributeType"); QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DRender::QAttribute::IndexAttribute)); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -232,7 +232,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "buffer"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), buf.id()); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -246,7 +246,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "buffer"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), buf2.id()); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); } }; diff --git a/tests/auto/render/qcameraselector/tst_qcameraselector.cpp b/tests/auto/render/qcameraselector/tst_qcameraselector.cpp index c1e567c6d..ecbea52b6 100644 --- a/tests/auto/render/qcameraselector/tst_qcameraselector.cpp +++ b/tests/auto/render/qcameraselector/tst_qcameraselector.cpp @@ -98,7 +98,7 @@ private Q_SLOTS: Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "camera"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), camera->id()); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -119,7 +119,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "camera"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), camera2->id()); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); // WHEN @@ -131,7 +131,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "camera"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), Qt3DCore::QNodeId()); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); } diff --git a/tests/auto/render/qclearbuffers/tst_qclearbuffers.cpp b/tests/auto/render/qclearbuffers/tst_qclearbuffers.cpp index 3e4de55b0..9e471d0fa 100644 --- a/tests/auto/render/qclearbuffers/tst_qclearbuffers.cpp +++ b/tests/auto/render/qclearbuffers/tst_qclearbuffers.cpp @@ -111,7 +111,7 @@ private Q_SLOTS: QCOMPARE(change->propertyName(), "buffers"); QCOMPARE(change->subjectId(), clearBuffer->id()); QCOMPARE(change->value().value<Qt3DRender::QClearBuffers::BufferType>(), Qt3DRender::QClearBuffers::AllBuffers); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -132,7 +132,7 @@ private Q_SLOTS: QCOMPARE(change->propertyName(), "buffers"); QCOMPARE(change->subjectId(), clearBuffer->id()); QCOMPARE(change->value().value<Qt3DRender::QClearBuffers::BufferType>(), Qt3DRender::QClearBuffers::ColorDepthBuffer); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); } diff --git a/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp b/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp index 8573c47a8..2d1bc1360 100644 --- a/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp +++ b/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp @@ -115,7 +115,7 @@ private Q_SLOTS: QCOMPARE(change->propertyName(), "enabled"); QCOMPARE(change->subjectId(), frameGraphNode->id()); QCOMPARE(change->value().toBool(), false); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -136,7 +136,7 @@ private Q_SLOTS: QCOMPARE(change->propertyName(), "enabled"); QCOMPARE(change->subjectId(), frameGraphNode->id()); QCOMPARE(change->value().toBool(), true); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); } diff --git a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp index cd61e8510..3f4e932be 100644 --- a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp +++ b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp @@ -162,7 +162,7 @@ private Q_SLOTS: Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "instanceCount"); QCOMPARE(change->value().value<int>(), 256); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -175,7 +175,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "vertexCount"); QCOMPARE(change->value().value<int>(), 1340); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -188,7 +188,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "indexOffset"); QCOMPARE(change->value().value<int>(), 883); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -201,7 +201,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "firstInstance"); QCOMPARE(change->value().value<int>(), 1200); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -214,7 +214,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "restartIndexValue"); QCOMPARE(change->value().value<int>(), 65535); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -227,7 +227,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "verticesPerPatch"); QCOMPARE(change->value().toInt(), 2); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -240,7 +240,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "primitiveRestartEnabled"); QCOMPARE(change->value().value<bool>(), true); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -253,7 +253,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "primitiveType"); QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DRender::QGeometryRenderer::Patches)); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -267,7 +267,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "geometryFactory"); QCOMPARE(change->value().value<Qt3DRender::QGeometryFactoryPtr>(), factory); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); diff --git a/tests/auto/render/qmaterial/tst_qmaterial.cpp b/tests/auto/render/qmaterial/tst_qmaterial.cpp index af02f3180..14e14cb36 100644 --- a/tests/auto/render/qmaterial/tst_qmaterial.cpp +++ b/tests/auto/render/qmaterial/tst_qmaterial.cpp @@ -259,7 +259,7 @@ private Q_SLOTS: Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "effect"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), effect.id()); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -281,7 +281,7 @@ private Q_SLOTS: change = arbiter2.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "effect"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), effect.id()); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); } void checkDynamicParametersAddedUpdates() @@ -374,7 +374,7 @@ private Q_SLOTS: Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "vertexShaderCode"); QCOMPARE(change->value().value<QByteArray>(), vertexCode); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -388,7 +388,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "fragmentShaderCode"); QCOMPARE(change->value().value<QByteArray>(), fragmentCode); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -402,7 +402,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "geometryShaderCode"); QCOMPARE(change->value().value<QByteArray>(), geometryCode); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -416,7 +416,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "computeShaderCode"); QCOMPARE(change->value().value<QByteArray>(), computeCode); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -430,7 +430,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "tessellationControlShaderCode"); QCOMPARE(change->value().value<QByteArray>(), tesselControlCode); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -444,7 +444,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "tessellationEvaluationShaderCode"); QCOMPARE(change->value().value<QByteArray>(), tesselEvalCode); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); } diff --git a/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp b/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp index 6711efcbc..291193d1f 100644 --- a/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp +++ b/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp @@ -116,7 +116,7 @@ private Q_SLOTS: Qt3DCore::QNodePropertyChangePtr change = arbiter.events.last().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "hoverEnabled"); QCOMPARE(change->value().toBool(), true); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); } diff --git a/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp b/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp index ed4bcc207..63fabf5b6 100644 --- a/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp +++ b/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp @@ -121,7 +121,7 @@ private Q_SLOTS: QCOMPARE(change->propertyName(), "target"); QCOMPARE(change->subjectId(), renderTargetSelector->id()); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), target->id()); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -142,7 +142,7 @@ private Q_SLOTS: QCOMPARE(change->propertyName(), "target"); QCOMPARE(change->subjectId(), renderTargetSelector->id()); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), Qt3DCore::QNodeId()); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -158,7 +158,7 @@ private Q_SLOTS: QCOMPARE(change->propertyName(), "outputs"); QCOMPARE(change->subjectId(), renderTargetSelector->id()); QCOMPARE(change->value().value<QVector<Qt3DRender::QRenderTargetOutput::AttachmentPoint> >(), outputs); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -179,7 +179,7 @@ private Q_SLOTS: QCOMPARE(change->propertyName(), "outputs"); QCOMPARE(change->subjectId(), renderTargetSelector->id()); QCOMPARE(change->value().value<QVector<Qt3DRender::QRenderTargetOutput::AttachmentPoint> >(), QVector<Qt3DRender::QRenderTargetOutput::AttachmentPoint>()); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); diff --git a/tests/auto/render/qviewport/tst_qviewport.cpp b/tests/auto/render/qviewport/tst_qviewport.cpp index 30c3bcccc..ca2a8bd0f 100644 --- a/tests/auto/render/qviewport/tst_qviewport.cpp +++ b/tests/auto/render/qviewport/tst_qviewport.cpp @@ -100,7 +100,7 @@ private Q_SLOTS: QCOMPARE(change->propertyName(), "normalizedRect"); QCOMPARE(change->subjectId(), viewport->id()); QCOMPARE(change->value().value<QRectF>(), QRectF(0.5f, 0.5f, 1.0f, 1.0f)); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); arbiter.events.clear(); @@ -121,7 +121,7 @@ private Q_SLOTS: QCOMPARE(change->propertyName(), "normalizedRect"); QCOMPARE(change->subjectId(), viewport->id()); QCOMPARE(change->value().value<QRectF>(), QRectF(0.0f, 0.0f, 1.0f, 1.0f)); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); } }; diff --git a/tests/auto/render/renderviewutils/tst_renderviewutils.cpp b/tests/auto/render/renderviewutils/tst_renderviewutils.cpp index 2c34fa1be..d1e10de91 100644 --- a/tests/auto/render/renderviewutils/tst_renderviewutils.cpp +++ b/tests/auto/render/renderviewutils/tst_renderviewutils.cpp @@ -476,7 +476,7 @@ void tst_RenderViewUtils::shouldNotifyDynamicPropertyChanges() // THEN QCOMPARE(arbiter.events.size(), 1); auto change = arbiter.events.first().dynamicCast<Qt3DCore::QNodeDynamicPropertyChange>(); - QCOMPARE(change->type(), Qt3DCore::NodeUpdated); + QCOMPARE(change->type(), Qt3DCore::PropertyUpdated); QCOMPARE(change->propertyName(), QByteArrayLiteral("scalar")); QCOMPARE(change->value().toFloat(), 883.0f); } |