diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-05-10 10:02:10 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-10 19:09:02 +0000 |
commit | 68817e1a5c7f1e9e04b4978ea79fd80047d239b1 (patch) | |
tree | 231108bc4f19b50256d5530c58c8a376456e2fc7 /tests/auto | |
parent | 7b037787471b618f6e8aa0737ee82e345086ac2c (diff) |
Remove QSceneChange::SenderType
Task-number: QTBUG-51494
Change-Id: I2414bee3b9eb3bd1146fd356bb0552366e63a976
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp | 4 | ||||
-rw-r--r-- | tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp | 4 | ||||
-rw-r--r-- | tests/auto/input/action/tst_action.cpp | 2 | ||||
-rw-r--r-- | tests/auto/input/analogaxisinput/tst_analogaxisinput.cpp | 6 | ||||
-rw-r--r-- | tests/auto/input/axis/tst_axis.cpp | 2 | ||||
-rw-r--r-- | tests/auto/input/buttonaxisinput/tst_buttonaxisinput.cpp | 8 | ||||
-rw-r--r-- | tests/auto/input/qaction/tst_qaction.cpp | 2 | ||||
-rw-r--r-- | tests/auto/input/qaxis/tst_qaxis.cpp | 2 | ||||
-rw-r--r-- | tests/auto/render/attribute/tst_attribute.cpp | 18 | ||||
-rw-r--r-- | tests/auto/render/buffer/tst_buffer.cpp | 10 | ||||
-rw-r--r-- | tests/auto/render/geometry/tst_geometry.cpp | 2 | ||||
-rw-r--r-- | tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp | 18 | ||||
-rw-r--r-- | tests/auto/render/material/tst_material.cpp | 6 | ||||
-rw-r--r-- | tests/auto/render/objectpicker/tst_objectpicker.cpp | 2 |
14 files changed, 43 insertions, 43 deletions
diff --git a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp index b2be8b47a..33c8090e1 100644 --- a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp +++ b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp @@ -84,7 +84,7 @@ public: void sendNodeUpdatedNotification() { - Qt3DCore::QNodePropertyChangePtr e(new Qt3DCore::QNodePropertyChange(Qt3DCore::QSceneChange::Node, id())); + Qt3DCore::QNodePropertyChangePtr e(new Qt3DCore::QNodePropertyChange(id())); e->setPropertyName("PropertyUpdated"); Qt3DCore::QNodePrivate::get(this)->notifyObservers(e); } @@ -103,7 +103,7 @@ public: void sendAllChangesNotification() { - Qt3DCore::QSceneChangePtr e(new Qt3DCore::QSceneChange(Qt3DCore::AllChanges, Qt3DCore::QSceneChange::Node, id())); + Qt3DCore::QSceneChangePtr e(new Qt3DCore::QSceneChange(Qt3DCore::AllChanges, id())); Qt3DCore::QNodePrivate::get(this)->notifyObservers(e); } diff --git a/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp b/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp index 633ca18c2..2589f5b89 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::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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 78d4ecf55..3167ad93e 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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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 eef75d97b..47bab244f 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::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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 5276327d6..192c7311b 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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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 993e56c16..40ba96b40 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::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::QNodeId())); updateChange->setPropertyName("sourceDevice"); updateChange->setValue(QVariant::fromValue(device.id())); backendAxisInput.sceneChangeEvent(updateChange); diff --git a/tests/auto/input/qaction/tst_qaction.cpp b/tests/auto/input/qaction/tst_qaction.cpp index 16fc37d6b..c391527a6 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::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr valueChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::QNodeId())); valueChange->setPropertyName("active"); valueChange->setValue(true); sceneChangeEvent(valueChange); diff --git a/tests/auto/input/qaxis/tst_qaxis.cpp b/tests/auto/input/qaxis/tst_qaxis.cpp index b7db142bf..3acbd9061 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::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr valueChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::QNodeId())); valueChange->setPropertyName("value"); valueChange->setValue(383.0f); sceneChangeEvent(valueChange); diff --git a/tests/auto/render/attribute/tst_attribute.cpp b/tests/auto/render/attribute/tst_attribute.cpp index 908d837ed..258f9d537 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::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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 ec58e3ba8..7a0619f1b 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::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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 cae77c16c..48be2c58d 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::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(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 493b48fd5..f21db5162 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::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::QNodeId())); updateChange->setPropertyName("geometryFactory"); Qt3DRender::QGeometryFactoryPtr factory(new TestFactory(1450)); updateChange->setValue(QVariant::fromValue(factory)); @@ -315,7 +315,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(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 8430660d9..59dcfbfe3 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(QSceneChange::Node, QNodeId())); + QNodePropertyChangePtr updateChange(new QNodePropertyChange(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(QSceneChange::Node, QNodeId())); + QNodePropertyChangePtr secondUpdateChange(new QNodePropertyChange(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::QSceneChange::Node, Qt3DCore::QNodeId())); + QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(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 b6bef6388..386aa8fa0 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::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::QNodeId())); updateChange->setValue(true); updateChange->setPropertyName("hoverEnabled"); objectPicker.sceneChangeEvent(updateChange); |