diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-04-21 14:27:25 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-04-21 14:50:56 +0000 |
commit | edfe8aa925598e0961411f27e14acf44a369c923 (patch) | |
tree | a0160ef1eb42ac0e1cd2cb2523379e95cb0e2dc0 /tests/auto/render/material/tst_material.cpp | |
parent | e52d11ef2a9ba8bfceb738a3b1c4c7c9a63f5000 (diff) |
Rename QScenePropertyChange -> QNodePropertyChange
Trying to unify naming of change types.
Change-Id: I0bfca0b7ba5adeaaa6145f75ddb41731f76adc09
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/auto/render/material/tst_material.cpp')
-rw-r--r-- | tests/auto/render/material/tst_material.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/render/material/tst_material.cpp b/tests/auto/render/material/tst_material.cpp index 3ec5f7cfa..c704ded28 100644 --- a/tests/auto/render/material/tst_material.cpp +++ b/tests/auto/render/material/tst_material.cpp @@ -32,7 +32,7 @@ #include <Qt3DRender/QMaterial> #include <Qt3DRender/QParameter> #include <Qt3DRender/QEffect> -#include <Qt3DCore/QScenePropertyChange> +#include <Qt3DCore/QNodePropertyChange> #include "testrenderer.h" using namespace Qt3DCore; @@ -135,7 +135,7 @@ void tst_RenderMaterial::shouldHandleParametersPropertyChange() backend.setRenderer(&renderer); // WHEN - QScenePropertyChangePtr addChange(new QScenePropertyChange(NodeAdded, QSceneChange::Node, parameter->id())); + QNodePropertyChangePtr addChange(new QNodePropertyChange(NodeAdded, QSceneChange::Node, parameter->id())); addChange->setValue(QVariant::fromValue(parameter->id())); addChange->setPropertyName("parameter"); backend.sceneChangeEvent(addChange); @@ -146,7 +146,7 @@ void tst_RenderMaterial::shouldHandleParametersPropertyChange() QVERIFY(renderer.dirtyBits() != 0); // WHEN - QScenePropertyChangePtr removeChange(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, parameter->id())); + QNodePropertyChangePtr removeChange(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, parameter->id())); removeChange->setValue(QVariant::fromValue(parameter->id())); removeChange->setPropertyName("parameter"); backend.sceneChangeEvent(removeChange); @@ -163,7 +163,7 @@ void tst_RenderMaterial::shouldHandleEnablePropertyChange() backend.setRenderer(&renderer); // WHEN - QScenePropertyChangePtr updateChange(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, QNodeId())); + QNodePropertyChangePtr updateChange(new QNodePropertyChange(NodeUpdated, QSceneChange::Node, QNodeId())); updateChange->setValue(true); updateChange->setPropertyName("enabled"); backend.sceneChangeEvent(updateChange); @@ -173,7 +173,7 @@ void tst_RenderMaterial::shouldHandleEnablePropertyChange() QVERIFY(renderer.dirtyBits() != 0); // WHEN - QScenePropertyChangePtr secondUpdateChange(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, QNodeId())); + QNodePropertyChangePtr secondUpdateChange(new QNodePropertyChange(NodeUpdated, QSceneChange::Node, QNodeId())); secondUpdateChange->setValue(false); secondUpdateChange->setPropertyName("enabled"); backend.sceneChangeEvent(secondUpdateChange); @@ -191,7 +191,7 @@ void tst_RenderMaterial::shouldHandleEffectPropertyChange() backend.setRenderer(&renderer); // WHEN - QScenePropertyChangePtr updateChange(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); Qt3DCore::QNodeId effectId = Qt3DCore::QNodeId::createId(); updateChange->setValue(QVariant::fromValue(effectId)); updateChange->setPropertyName("effect"); |