diff options
40 files changed, 96 insertions, 96 deletions
diff --git a/src/core/qnodeaddedpropertychange.cpp b/src/core/qnodeaddedpropertychange.cpp index fe3a716ff..e425be43f 100644 --- a/src/core/qnodeaddedpropertychange.cpp +++ b/src/core/qnodeaddedpropertychange.cpp @@ -65,7 +65,7 @@ namespace Qt3DCore { */ QNodeAddedPropertyChange::QNodeAddedPropertyChange(QNodeId subjectId, QNode *node, QSceneChange::Priority priority) - : QNodePropertyChangeBase(*new QNodeAddedPropertyChangePrivate, NodeAdded, Node, subjectId, priority) + : QNodePropertyChangeBase(*new QNodeAddedPropertyChangePrivate, PropertyValueAdded, Node, subjectId, priority) { Q_D(QNodeAddedPropertyChange); d->m_addedNodeIdTypePair = QNodeIdTypePair(node->id(), node->metaObject()); diff --git a/src/core/qnoderemovedpropertychange.cpp b/src/core/qnoderemovedpropertychange.cpp index 532ad63f0..702d2d8c2 100644 --- a/src/core/qnoderemovedpropertychange.cpp +++ b/src/core/qnoderemovedpropertychange.cpp @@ -65,7 +65,7 @@ namespace Qt3DCore { */ QNodeRemovedPropertyChange::QNodeRemovedPropertyChange(QNodeId subjectId, QNode *node, QSceneChange::Priority priority) - : QNodePropertyChangeBase(*new QNodeRemovedPropertyChangePrivate, NodeRemoved, Node, subjectId, priority) + : QNodePropertyChangeBase(*new QNodeRemovedPropertyChangePrivate, PropertyValueRemoved, Node, subjectId, priority) { Q_D(QNodeRemovedPropertyChange); d->m_removedNodeIdTypePair = QNodeIdTypePair(node->id(), QNodePrivate::get(node)->m_typeInfo); diff --git a/src/core/qscenechange.cpp b/src/core/qscenechange.cpp index 92a3960b1..3216186f5 100644 --- a/src/core/qscenechange.cpp +++ b/src/core/qscenechange.cpp @@ -54,8 +54,8 @@ namespace Qt3DCore { * \value NodeCreated A new instance of a QNode subclass has been created. * \value NodeDeleted A QNode has been deleted. * \value PropertyUpdated A QNode property has been updated. - * \value NodeAdded A QNode has been added to the scene. - * \value NodeRemoved A QNode has been removed from the scene. + * \value PropertyValueAdded A QNode has been added to the scene. + * \value PropertyValueRemoved A QNode has been removed from the scene. * \value ComponentAdded A QComponent has been added to a QEntity. * \value ComponentRemoved A QComponent has been removed from a QEntity. * \value AllChanges Allows an observer to monitor for any of the above changes. diff --git a/src/core/qscenechange.h b/src/core/qscenechange.h index 0f6647ed6..bb05db6fa 100644 --- a/src/core/qscenechange.h +++ b/src/core/qscenechange.h @@ -52,8 +52,8 @@ enum ChangeFlag { NodeCreated = 1 << 0, NodeDeleted = 1 << 1, PropertyUpdated = 1 << 2, - NodeAdded = 1 << 3, - NodeRemoved = 1 << 4, + PropertyValueAdded = 1 << 3, + PropertyValueRemoved = 1 << 4, ComponentAdded = 1 << 5, ComponentRemoved = 1 << 6, AllChanges = 0xFFFFFFFF diff --git a/src/input/backend/action.cpp b/src/input/backend/action.cpp index 36e3f3019..dc9ff4924 100644 --- a/src/input/backend/action.cpp +++ b/src/input/backend/action.cpp @@ -88,14 +88,14 @@ void Action::setActionTriggered(bool actionTriggered) void Action::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { - case Qt3DCore::NodeAdded: { + case Qt3DCore::PropertyValueAdded: { const auto change = qSharedPointerCast<Qt3DCore::QNodeAddedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("input")) m_inputs.push_back(change->addedNodeId()); break; } - case Qt3DCore::NodeRemoved: { + case Qt3DCore::PropertyValueRemoved: { const auto change = qSharedPointerCast<Qt3DCore::QNodeRemovedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("input")) m_inputs.removeOne(change->removedNodeId()); diff --git a/src/input/backend/axis.cpp b/src/input/backend/axis.cpp index db5134bd4..946d62a40 100644 --- a/src/input/backend/axis.cpp +++ b/src/input/backend/axis.cpp @@ -88,14 +88,14 @@ void Axis::setAxisValue(float axisValue) void Axis::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { - case Qt3DCore::NodeAdded: { + case Qt3DCore::PropertyValueAdded: { const auto change = qSharedPointerCast<Qt3DCore::QNodeAddedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("input")) m_inputs.push_back(change->addedNodeId()); break; } - case Qt3DCore::NodeRemoved: { + case Qt3DCore::PropertyValueRemoved: { const auto change = qSharedPointerCast<Qt3DCore::QNodeRemovedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("input")) m_inputs.removeOne(change->removedNodeId()); diff --git a/src/input/backend/inputchord.cpp b/src/input/backend/inputchord.cpp index f357411c5..a5252e7eb 100644 --- a/src/input/backend/inputchord.cpp +++ b/src/input/backend/inputchord.cpp @@ -108,7 +108,7 @@ void InputChord::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) break; } - case Qt3DCore::NodeAdded: { + case Qt3DCore::PropertyValueAdded: { const auto change = qSharedPointerCast<Qt3DCore::QNodeAddedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("chord")) { m_chords.push_back(change->addedNodeId()); @@ -117,7 +117,7 @@ void InputChord::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) break; } - case Qt3DCore::NodeRemoved: { + case Qt3DCore::PropertyValueRemoved: { const auto change = qSharedPointerCast<Qt3DCore::QNodeRemovedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("chord")) { m_chords.removeOne(change->removedNodeId()); diff --git a/src/input/backend/inputsequence.cpp b/src/input/backend/inputsequence.cpp index 59d3a2ff6..5c4906715 100644 --- a/src/input/backend/inputsequence.cpp +++ b/src/input/backend/inputsequence.cpp @@ -133,7 +133,7 @@ void InputSequence::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) break; } - case Qt3DCore::NodeAdded: { + case Qt3DCore::PropertyValueAdded: { const auto change = qSharedPointerCast<Qt3DCore::QNodeAddedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("sequence")) { m_sequences.push_back(change->addedNodeId()); @@ -142,7 +142,7 @@ void InputSequence::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) break; } - case Qt3DCore::NodeRemoved: { + case Qt3DCore::PropertyValueRemoved: { const auto change = qSharedPointerCast<Qt3DCore::QNodeRemovedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("sequence")) { m_sequences.removeOne(change->removedNodeId()); diff --git a/src/input/backend/logicaldevice.cpp b/src/input/backend/logicaldevice.cpp index 06dbd867a..2daad3d7f 100644 --- a/src/input/backend/logicaldevice.cpp +++ b/src/input/backend/logicaldevice.cpp @@ -76,7 +76,7 @@ void LogicalDevice::cleanup() void LogicalDevice::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { - case Qt3DCore::NodeAdded: { + case Qt3DCore::PropertyValueAdded: { const auto change = qSharedPointerCast<Qt3DCore::QNodeAddedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("axis")) m_axes.push_back(change->addedNodeId()); @@ -85,7 +85,7 @@ void LogicalDevice::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) break; } - case Qt3DCore::NodeRemoved: { + case Qt3DCore::PropertyValueRemoved: { const auto change = qSharedPointerCast<Qt3DCore::QNodeRemovedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("axis")) m_axes.removeOne(change->removedNodeId()); diff --git a/src/input/backend/qabstractphysicaldevicebackendnode.cpp b/src/input/backend/qabstractphysicaldevicebackendnode.cpp index 276c679d8..7af233693 100644 --- a/src/input/backend/qabstractphysicaldevicebackendnode.cpp +++ b/src/input/backend/qabstractphysicaldevicebackendnode.cpp @@ -178,7 +178,7 @@ void QAbstractPhysicalDeviceBackendNode::sceneChangeEvent(const Qt3DCore::QScene { Q_D(QAbstractPhysicalDeviceBackendNode); switch (e->type()) { - case Qt3DCore::NodeAdded: { + case Qt3DCore::PropertyValueAdded: { const auto change = qSharedPointerCast<Qt3DCore::QNodeAddedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("axisSettings")) { const auto axisSettingId = change->addedNodeId(); @@ -190,7 +190,7 @@ void QAbstractPhysicalDeviceBackendNode::sceneChangeEvent(const Qt3DCore::QScene break; } - case Qt3DCore::NodeRemoved: { + case Qt3DCore::PropertyValueRemoved: { const auto change = qSharedPointerCast<Qt3DCore::QNodeRemovedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("axisSettings")) d->removeAxisSetting(change->removedNodeId()); diff --git a/src/render/backend/rendertarget.cpp b/src/render/backend/rendertarget.cpp index 4521852c3..c1beecd5e 100644 --- a/src/render/backend/rendertarget.cpp +++ b/src/render/backend/rendertarget.cpp @@ -90,7 +90,7 @@ QVector<Qt3DCore::QNodeId> RenderTarget::renderOutputs() const void RenderTarget::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { - case Qt3DCore::NodeAdded: { + case Qt3DCore::PropertyValueAdded: { const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("output")) { appendRenderOutput(change->addedNodeId()); @@ -99,7 +99,7 @@ void RenderTarget::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) break; } - case Qt3DCore::NodeRemoved: { + case Qt3DCore::PropertyValueRemoved: { const auto change = qSharedPointerCast<QNodeRemovedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("output")) { removeRenderOutput(change->removedNodeId()); diff --git a/src/render/framegraph/layerfilternode.cpp b/src/render/framegraph/layerfilternode.cpp index 6f340aaad..014a7a06c 100644 --- a/src/render/framegraph/layerfilternode.cpp +++ b/src/render/framegraph/layerfilternode.cpp @@ -67,14 +67,14 @@ void LayerFilterNode::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBaseP void LayerFilterNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { - case NodeAdded: { + case PropertyValueAdded: { const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("layer")) m_layerIds.append(change->addedNodeId()); break; } - case NodeRemoved: { + case PropertyValueRemoved: { const auto change = qSharedPointerCast<QNodeRemovedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("layer")) m_layerIds.remove(change->removedNodeId()); diff --git a/src/render/framegraph/qsortpolicy.cpp b/src/render/framegraph/qsortpolicy.cpp index 12b1843d4..170f12c68 100644 --- a/src/render/framegraph/qsortpolicy.cpp +++ b/src/render/framegraph/qsortpolicy.cpp @@ -78,7 +78,7 @@ void QSortPolicy::addSortType(Qt3DRender::QSortPolicy::SortType sortType) d->m_sortTypes.append(sortType); if (d->m_changeArbiter != nullptr) { - QNodePropertyChangePtr propertyChange(new QNodePropertyChange(NodeAdded, QSceneChange::Node, id())); + QNodePropertyChangePtr propertyChange(new QNodePropertyChange(PropertyValueAdded, QSceneChange::Node, id())); propertyChange->setPropertyName("sortType"); propertyChange->setValue(QVariant::fromValue(sortType)); d->notifyObservers(propertyChange); @@ -90,7 +90,7 @@ void QSortPolicy::removeSortType(SortType sortType) { Q_D(QSortPolicy); if (d->m_changeArbiter != nullptr) { - QNodePropertyChangePtr propertyChange(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, id())); + QNodePropertyChangePtr propertyChange(new QNodePropertyChange(PropertyValueRemoved, QSceneChange::Node, id())); propertyChange->setPropertyName("sortType"); propertyChange->setValue(QVariant::fromValue(sortType)); d->notifyObservers(propertyChange); diff --git a/src/render/framegraph/renderpassfilternode.cpp b/src/render/framegraph/renderpassfilternode.cpp index e5d143fb1..9e993d564 100644 --- a/src/render/framegraph/renderpassfilternode.cpp +++ b/src/render/framegraph/renderpassfilternode.cpp @@ -93,7 +93,7 @@ void RenderPassFilter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { - case NodeAdded: { + case PropertyValueAdded: { const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("match")) { appendFilter(change->addedNodeId()); @@ -105,7 +105,7 @@ void RenderPassFilter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) break; } - case NodeRemoved: { + case PropertyValueRemoved: { const auto change = qSharedPointerCast<QNodeRemovedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("match")) { removeFilter(change->removedNodeId()); diff --git a/src/render/framegraph/sortpolicy.cpp b/src/render/framegraph/sortpolicy.cpp index 697bc0476..b3b5f1f79 100644 --- a/src/render/framegraph/sortpolicy.cpp +++ b/src/render/framegraph/sortpolicy.cpp @@ -59,9 +59,9 @@ void SortPolicy::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) if (propertyChange->propertyName() == QByteArrayLiteral("sortType")) { const QSortPolicy::SortType cId = propertyChange->value().value<QSortPolicy::SortType>(); if (cId == QSortPolicy::StateChangeCost || cId == QSortPolicy::BackToFront || cId == QSortPolicy::Material) { - if (e->type() == NodeAdded) + if (e->type() == PropertyValueAdded) m_sortTypes.append(cId); - else if (e->type() == NodeRemoved) + else if (e->type() == PropertyValueRemoved) m_sortTypes.removeAll(cId); } } diff --git a/src/render/framegraph/statesetnode.cpp b/src/render/framegraph/statesetnode.cpp index e0dc9b45d..2144ecfdd 100644 --- a/src/render/framegraph/statesetnode.cpp +++ b/src/render/framegraph/statesetnode.cpp @@ -75,7 +75,7 @@ void StateSetNode::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr void StateSetNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { - case NodeAdded: { + case PropertyValueAdded: { const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("renderState")) { appendRenderState(change->addedNodeId()); @@ -84,7 +84,7 @@ void StateSetNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) break; } - case NodeRemoved: { + case PropertyValueRemoved: { const auto propertyChange = qSharedPointerCast<QNodeRemovedPropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("renderState")) { removeRenderState(propertyChange->removedNodeId()); diff --git a/src/render/framegraph/techniquefilternode.cpp b/src/render/framegraph/techniquefilternode.cpp index 08a7600c7..794612962 100644 --- a/src/render/framegraph/techniquefilternode.cpp +++ b/src/render/framegraph/techniquefilternode.cpp @@ -92,7 +92,7 @@ void TechniqueFilter::removeFilter(Qt3DCore::QNodeId criterionId) void TechniqueFilter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { - case NodeAdded: { + case PropertyValueAdded: { const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("matchAll")) { appendFilter(change->addedNodeId()); @@ -104,7 +104,7 @@ void TechniqueFilter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) break; } - case NodeRemoved: { + case PropertyValueRemoved: { const auto change = qSharedPointerCast<QNodeRemovedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("matchAll")) { removeFilter(change->removedNodeId()); diff --git a/src/render/geometry/geometry.cpp b/src/render/geometry/geometry.cpp index 381256cf6..d88ffa121 100644 --- a/src/render/geometry/geometry.cpp +++ b/src/render/geometry/geometry.cpp @@ -82,7 +82,7 @@ void Geometry::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &cha void Geometry::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { - case NodeAdded: { + case PropertyValueAdded: { const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("attribute")) { m_attributes.push_back(change->addedNodeId()); @@ -91,7 +91,7 @@ void Geometry::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) break; } - case NodeRemoved: { + case PropertyValueRemoved: { const auto change = qSharedPointerCast<QNodeRemovedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("attribute")) { m_attributes.removeOne(change->removedNodeId()); diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp index bc55d2f3d..05af44b65 100644 --- a/src/render/geometry/geometryrenderer.cpp +++ b/src/render/geometry/geometryrenderer.cpp @@ -168,7 +168,7 @@ void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) break; } - case NodeAdded: { + case PropertyValueAdded: { const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("geometry")) { m_geometryId = change->addedNodeId(); @@ -177,7 +177,7 @@ void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) break; } - case NodeRemoved: { + case PropertyValueRemoved: { const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("geometry")) { m_geometryId = QNodeId(); diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp index 548409d6d..aa055e856 100644 --- a/src/render/geometry/qgeometryrenderer.cpp +++ b/src/render/geometry/qgeometryrenderer.cpp @@ -380,7 +380,7 @@ void QGeometryRenderer::setGeometry(QGeometry *geometry) return; // TODO: Investigate if we can rely upon the automatic property change notifications - // rather than having to manually send a NodeRemoved followed by a NodeAdded change. + // rather than having to manually send a PropertyValueRemoved followed by a PropertyValueAdded change. if (d->m_geometry && d->m_changeArbiter) { const auto change = QNodeRemovedPropertyChangePtr::create(id(), d->m_geometry); change->setPropertyName("geometry"); diff --git a/src/render/materialsystem/effect.cpp b/src/render/materialsystem/effect.cpp index 0ca045839..01df33f14 100644 --- a/src/render/materialsystem/effect.cpp +++ b/src/render/materialsystem/effect.cpp @@ -82,7 +82,7 @@ void Effect::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &chang void Effect::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { - case NodeAdded: { + case PropertyValueAdded: { const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("technique")) appendRenderTechnique(change->addedNodeId()); @@ -91,7 +91,7 @@ void Effect::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) break; } - case NodeRemoved: { + case PropertyValueRemoved: { const auto change = qSharedPointerCast<QNodeRemovedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("technique")) m_techniques.removeOne(change->removedNodeId()); diff --git a/src/render/materialsystem/material.cpp b/src/render/materialsystem/material.cpp index 90c6d79f0..82296c277 100644 --- a/src/render/materialsystem/material.cpp +++ b/src/render/materialsystem/material.cpp @@ -93,14 +93,14 @@ void Material::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) break; } - case NodeAdded: { + case PropertyValueAdded: { const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("parameter")) m_parameterPack.appendParameter(change->addedNodeId()); break; } - case NodeRemoved: { + case PropertyValueRemoved: { const auto change = qSharedPointerCast<QNodeRemovedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("parameter")) m_parameterPack.removeParameter(change->removedNodeId()); diff --git a/src/render/materialsystem/qrenderpass.cpp b/src/render/materialsystem/qrenderpass.cpp index a312c5469..d27bd5583 100644 --- a/src/render/materialsystem/qrenderpass.cpp +++ b/src/render/materialsystem/qrenderpass.cpp @@ -98,7 +98,7 @@ void QRenderPass::setShaderProgram(QShaderProgram *shaderProgram) shaderProgram->setParent(this); if (d->m_shader && d->m_changeArbiter != nullptr) { - QNodePropertyChangePtr e(new QNodePropertyChange(NodeAdded, QSceneChange::Node, id())); + QNodePropertyChangePtr e(new QNodePropertyChange(PropertyValueAdded, QSceneChange::Node, id())); const auto change = QNodeAddedPropertyChangePtr::create(id(), d->m_shader); change->setPropertyName("shaderProgram"); d->notifyObservers(change); diff --git a/src/render/materialsystem/renderpass.cpp b/src/render/materialsystem/renderpass.cpp index 617085a24..adae7d9af 100644 --- a/src/render/materialsystem/renderpass.cpp +++ b/src/render/materialsystem/renderpass.cpp @@ -86,7 +86,7 @@ void RenderPass::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &c void RenderPass::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { - case NodeAdded: { + case PropertyValueAdded: { const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("filterKeys")) appendFilterKey(change->addedNodeId()); @@ -99,7 +99,7 @@ void RenderPass::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) break; } - case NodeRemoved: { + case PropertyValueRemoved: { const auto change = qSharedPointerCast<QNodeRemovedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("filterKeys")) removeFilterKey(change->removedNodeId()); diff --git a/src/render/materialsystem/technique.cpp b/src/render/materialsystem/technique.cpp index 7c6dc30e5..ed9523e9a 100644 --- a/src/render/materialsystem/technique.cpp +++ b/src/render/materialsystem/technique.cpp @@ -102,7 +102,7 @@ void Technique::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) break; } - case NodeAdded: { + case PropertyValueAdded: { const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("pass")) appendRenderPass(change->addedNodeId()); @@ -113,7 +113,7 @@ void Technique::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) break; } - case NodeRemoved: { + case PropertyValueRemoved: { const auto change = qSharedPointerCast<QNodeRemovedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("pass")) removeRenderPass(change->removedNodeId()); diff --git a/src/render/texture/texture.cpp b/src/render/texture/texture.cpp index 8153440f7..af5e62236 100644 --- a/src/render/texture/texture.cpp +++ b/src/render/texture/texture.cpp @@ -584,7 +584,7 @@ void Texture::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) } break; - case NodeAdded: { + case PropertyValueAdded: { const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("textureImage")) { m_textureImages.append(m_textureImageManager->lookupHandle(change->addedNodeId())); @@ -592,7 +592,7 @@ void Texture::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) } break; - case NodeRemoved: { + case PropertyValueRemoved: { const auto change = qSharedPointerCast<QNodeRemovedPropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("textureImage")) { m_textureImages.removeOne(m_textureImageManager->lookupHandle(change->removedNodeId())); diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp index 2a8714f5c..64f01a936 100644 --- a/tests/auto/core/nodes/tst_nodes.cpp +++ b/tests/auto/core/nodes/tst_nodes.cpp @@ -598,7 +598,7 @@ void tst_Nodes::checkParentChangeToOtherParent() // CHECK event 1 is a Node Removed event QVERIFY(spyParent1.events.first().wasLocked()); const Qt3DCore::QNodeRemovedPropertyChangePtr event = spyParent1.events.takeFirst().change().dynamicCast<Qt3DCore::QNodeRemovedPropertyChange>(); - QCOMPARE(event->type(), Qt3DCore::NodeRemoved); + QCOMPARE(event->type(), Qt3DCore::PropertyValueRemoved); QCOMPARE(event->subjectId(), parent1->id()); QCOMPARE(event->removedNodeId(), child->id()); QCOMPARE(event->metaObject(), child->metaObject()); @@ -606,7 +606,7 @@ void tst_Nodes::checkParentChangeToOtherParent() // CHECK event 2 is a Node Added event QVERIFY(spyParent2.events.last().wasLocked()); const Qt3DCore::QNodeAddedPropertyChangePtr event2 = spyParent2.events.last().change().dynamicCast<Qt3DCore::QNodeAddedPropertyChange>(); - QCOMPARE(event2->type(), Qt3DCore::NodeAdded); + QCOMPARE(event2->type(), Qt3DCore::PropertyValueAdded); QCOMPARE(event2->subjectId(), parent2->id()); QCOMPARE(event2->addedNodeId(), child->id()); QCOMPARE(event2->metaObject(), child->metaObject()); 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); diff --git a/tests/auto/input/qaction/tst_qaction.cpp b/tests/auto/input/qaction/tst_qaction.cpp index acfded98c..bc4f84e99 100644 --- a/tests/auto/input/qaction/tst_qaction.cpp +++ b/tests/auto/input/qaction/tst_qaction.cpp @@ -119,7 +119,7 @@ private Q_SLOTS: Qt3DCore::QNodeAddedPropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodeAddedPropertyChange>(); QCOMPARE(change->propertyName(), "input"); QCOMPARE(change->addedNodeId(), input->id()); - QCOMPARE(change->type(), Qt3DCore::NodeAdded); + QCOMPARE(change->type(), Qt3DCore::PropertyValueAdded); arbiter.events.clear(); @@ -132,7 +132,7 @@ private Q_SLOTS: Qt3DCore::QNodeRemovedPropertyChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>(); QCOMPARE(nodeRemovedChange->propertyName(), "input"); QCOMPARE(nodeRemovedChange->removedNodeId(), input->id()); - QCOMPARE(nodeRemovedChange->type(), Qt3DCore::NodeRemoved); + QCOMPARE(nodeRemovedChange->type(), Qt3DCore::PropertyValueRemoved); arbiter.events.clear(); } diff --git a/tests/auto/input/qaxis/tst_qaxis.cpp b/tests/auto/input/qaxis/tst_qaxis.cpp index 64ad3ea69..b4c047fae 100644 --- a/tests/auto/input/qaxis/tst_qaxis.cpp +++ b/tests/auto/input/qaxis/tst_qaxis.cpp @@ -116,7 +116,7 @@ private Q_SLOTS: Qt3DCore::QNodeAddedPropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodeAddedPropertyChange>(); QCOMPARE(change->propertyName(), "input"); QCOMPARE(change->addedNodeId(), input->id()); - QCOMPARE(change->type(), Qt3DCore::NodeAdded); + QCOMPARE(change->type(), Qt3DCore::PropertyValueAdded); arbiter.events.clear(); @@ -129,7 +129,7 @@ private Q_SLOTS: Qt3DCore::QNodeRemovedPropertyChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>(); QCOMPARE(nodeRemovedChange->propertyName(), "input"); QCOMPARE(nodeRemovedChange->removedNodeId(), input->id()); - QCOMPARE(nodeRemovedChange->type(), Qt3DCore::NodeRemoved); + QCOMPARE(nodeRemovedChange->type(), Qt3DCore::PropertyValueRemoved); arbiter.events.clear(); } diff --git a/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp b/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp index 0039996b1..b4d0309e5 100644 --- a/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp +++ b/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp @@ -125,7 +125,7 @@ private Q_SLOTS: Qt3DCore::QNodeAddedPropertyChangePtr nodeAddedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeAddedPropertyChange>(); QCOMPARE(nodeAddedChange->propertyName(), "action"); QCOMPARE(nodeAddedChange->addedNodeId(), action->id()); - QCOMPARE(nodeAddedChange->type(), Qt3DCore::NodeAdded); + QCOMPARE(nodeAddedChange->type(), Qt3DCore::PropertyValueAdded); arbiter.events.clear(); @@ -138,7 +138,7 @@ private Q_SLOTS: Qt3DCore::QNodeRemovedPropertyChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>(); QCOMPARE(nodeRemovedChange->propertyName(), "action"); QCOMPARE(nodeRemovedChange->removedNodeId(), action->id()); - QCOMPARE(nodeRemovedChange->type(), Qt3DCore::NodeRemoved); + QCOMPARE(nodeRemovedChange->type(), Qt3DCore::PropertyValueRemoved); arbiter.events.clear(); @@ -155,7 +155,7 @@ private Q_SLOTS: nodeAddedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeAddedPropertyChange>(); QCOMPARE(nodeAddedChange->propertyName(), "axis"); QCOMPARE(nodeAddedChange->addedNodeId(), axis->id()); - QCOMPARE(nodeAddedChange->type(), Qt3DCore::NodeAdded); + QCOMPARE(nodeAddedChange->type(), Qt3DCore::PropertyValueAdded); arbiter.events.clear(); @@ -168,7 +168,7 @@ private Q_SLOTS: nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>(); QCOMPARE(nodeRemovedChange->propertyName(), "axis"); QCOMPARE(nodeRemovedChange->removedNodeId(), axis->id()); - QCOMPARE(nodeRemovedChange->type(), Qt3DCore::NodeRemoved); + QCOMPARE(nodeRemovedChange->type(), Qt3DCore::PropertyValueRemoved); arbiter.events.clear(); } diff --git a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp index 0a28d5069..63fba19ed 100644 --- a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp +++ b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp @@ -303,7 +303,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyValueRemoved, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); const auto nodeRemovedChange = Qt3DCore::QNodeRemovedPropertyChangePtr::create(Qt3DCore::QNodeId(), &geometry); nodeRemovedChange->setPropertyName("geometry"); renderGeometryRenderer.sceneChangeEvent(nodeRemovedChange); diff --git a/tests/auto/render/qgeometry/tst_qgeometry.cpp b/tests/auto/render/qgeometry/tst_qgeometry.cpp index deb9c63cd..b85798245 100644 --- a/tests/auto/render/qgeometry/tst_qgeometry.cpp +++ b/tests/auto/render/qgeometry/tst_qgeometry.cpp @@ -121,7 +121,7 @@ private Q_SLOTS: Qt3DCore::QNodeAddedPropertyChangePtr nodeAddedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeAddedPropertyChange>(); QCOMPARE(nodeAddedChange->propertyName(), "attribute"); QCOMPARE(nodeAddedChange->addedNodeId(), attr.id()); - QCOMPARE(nodeAddedChange->type(), Qt3DCore::NodeAdded); + QCOMPARE(nodeAddedChange->type(), Qt3DCore::PropertyValueAdded); arbiter.events.clear(); @@ -141,7 +141,7 @@ private Q_SLOTS: Qt3DCore::QNodeRemovedPropertyChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>(); QCOMPARE(nodeRemovedChange->propertyName(), "attribute"); QCOMPARE(nodeRemovedChange->removedNodeId(), attr.id()); - QCOMPARE(nodeRemovedChange->type(), Qt3DCore::NodeRemoved); + QCOMPARE(nodeRemovedChange->type(), Qt3DCore::PropertyValueRemoved); arbiter.events.clear(); } 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<Qt3DCore::QNodeAddedPropertyChange>(); 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<Qt3DCore::QNodeRemovedPropertyChange>(); QCOMPARE(nodeRemovedChange->propertyName(), "geometry"); QCOMPARE(nodeRemovedChange->removedNodeId(), geom.id()); - QCOMPARE(nodeRemovedChange->type(), Qt3DCore::NodeRemoved); + QCOMPARE(nodeRemovedChange->type(), Qt3DCore::PropertyValueRemoved); nodeAddedChange = arbiter.events.last().staticCast<Qt3DCore::QNodeAddedPropertyChange>(); QCOMPARE(nodeAddedChange->propertyName(), "geometry"); QCOMPARE(nodeAddedChange->addedNodeId(), geom2.id()); - QCOMPARE(nodeAddedChange->type(), Qt3DCore::NodeAdded); + QCOMPARE(nodeAddedChange->type(), Qt3DCore::PropertyValueAdded); arbiter.events.clear(); } diff --git a/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp b/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp index 57f5edcf0..626773b91 100644 --- a/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp +++ b/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp @@ -127,7 +127,7 @@ private Q_SLOTS: QCOMPARE(addChange->propertyName(), "layer"); QCOMPARE(addChange->subjectId(), layerFilter->id()); QCOMPARE(addChange->addedNodeId(), layerFilter->layers().at(0)->id()); - QCOMPARE(addChange->type(), Qt3DCore::NodeAdded); + QCOMPARE(addChange->type(), Qt3DCore::PropertyValueAdded); arbiter.events.clear(); @@ -143,7 +143,7 @@ private Q_SLOTS: QCOMPARE(addChange->propertyName(), "layer"); QCOMPARE(addChange->subjectId(), layerFilter->id()); QCOMPARE(addChange->addedNodeId(), layerFilter->layers().at(1)->id()); - QCOMPARE(addChange->type(), Qt3DCore::NodeAdded); + QCOMPARE(addChange->type(), Qt3DCore::PropertyValueAdded); arbiter.events.clear(); @@ -158,7 +158,7 @@ private Q_SLOTS: QCOMPARE(removeChange->propertyName(), "layer"); QCOMPARE(removeChange->subjectId(), layerFilter->id()); QCOMPARE(removeChange->removedNodeId(), layer->id()); - QCOMPARE(removeChange->type(), Qt3DCore::NodeRemoved); + QCOMPARE(removeChange->type(), Qt3DCore::PropertyValueRemoved); arbiter.events.clear(); } diff --git a/tests/auto/render/qmaterial/tst_qmaterial.cpp b/tests/auto/render/qmaterial/tst_qmaterial.cpp index 14e14cb36..6c0e19c1c 100644 --- a/tests/auto/render/qmaterial/tst_qmaterial.cpp +++ b/tests/auto/render/qmaterial/tst_qmaterial.cpp @@ -307,7 +307,7 @@ private Q_SLOTS: Qt3DCore::QNodeAddedPropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodeAddedPropertyChange>(); QCOMPARE(change->propertyName(), "parameter"); QCOMPARE(change->addedNodeId(), param->id()); - QCOMPARE(change->type(), Qt3DCore::NodeAdded); + QCOMPARE(change->type(), Qt3DCore::PropertyValueAdded); arbiter.events.clear(); @@ -321,7 +321,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodeAddedPropertyChange>(); QCOMPARE(change->propertyName(), "parameter"); QCOMPARE(change->addedNodeId(), param->id()); - QCOMPARE(change->type(), Qt3DCore::NodeAdded); + QCOMPARE(change->type(), Qt3DCore::PropertyValueAdded); arbiter.events.clear(); @@ -335,7 +335,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodeAddedPropertyChange>(); QCOMPARE(change->propertyName(), "parameter"); QCOMPARE(change->addedNodeId(), param->id()); - QCOMPARE(change->type(), Qt3DCore::NodeAdded); + QCOMPARE(change->type(), Qt3DCore::PropertyValueAdded); arbiter.events.clear(); @@ -349,7 +349,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QNodeAddedPropertyChange>(); QCOMPARE(change->propertyName(), "parameter"); QCOMPARE(change->addedNodeId(), param->id()); - QCOMPARE(change->type(), Qt3DCore::NodeAdded); + QCOMPARE(change->type(), Qt3DCore::PropertyValueAdded); arbiter.events.clear(); } diff --git a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp index 3d4d885d6..753977dc1 100644 --- a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp +++ b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp @@ -158,7 +158,7 @@ private Q_SLOTS: QCOMPARE(change->propertyName(), "parameter"); QCOMPARE(change->subjectId(),renderPassFilter->id()); QCOMPARE(change->addedNodeId(), param1->id()); - QCOMPARE(change->type(), Qt3DCore::NodeAdded); + QCOMPARE(change->type(), Qt3DCore::PropertyValueAdded); arbiter.events.clear(); @@ -179,7 +179,7 @@ private Q_SLOTS: QCOMPARE(nodeRemovedChange->propertyName(), "parameter"); QCOMPARE(nodeRemovedChange->subjectId(), renderPassFilter->id()); QCOMPARE(nodeRemovedChange->removedNodeId(), param1->id()); - QCOMPARE(nodeRemovedChange->type(), Qt3DCore::NodeRemoved); + QCOMPARE(nodeRemovedChange->type(), Qt3DCore::PropertyValueRemoved); arbiter.events.clear(); @@ -194,7 +194,7 @@ private Q_SLOTS: QCOMPARE(change->propertyName(), "match"); QCOMPARE(change->subjectId(),renderPassFilter->id()); QCOMPARE(change->addedNodeId(), filterKey1->id()); - QCOMPARE(change->type(), Qt3DCore::NodeAdded); + QCOMPARE(change->type(), Qt3DCore::PropertyValueAdded); arbiter.events.clear(); @@ -215,7 +215,7 @@ private Q_SLOTS: QCOMPARE(nodeRemovedChange->propertyName(), "match"); QCOMPARE(nodeRemovedChange->subjectId(), renderPassFilter->id()); QCOMPARE(nodeRemovedChange->removedNodeId(), filterKey1->id()); - QCOMPARE(nodeRemovedChange->type(), Qt3DCore::NodeRemoved); + QCOMPARE(nodeRemovedChange->type(), Qt3DCore::PropertyValueRemoved); arbiter.events.clear(); } diff --git a/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp b/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp index d734c45f5..a11d0c193 100644 --- a/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp +++ b/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp @@ -144,7 +144,7 @@ private Q_SLOTS: QCOMPARE(change->propertyName(), "renderState"); QCOMPARE(change->subjectId(), stateSet->id()); QCOMPARE(change->addedNodeId(), state1->id()); - QCOMPARE(change->type(), Qt3DCore::NodeAdded); + QCOMPARE(change->type(), Qt3DCore::PropertyValueAdded); arbiter.events.clear(); @@ -165,7 +165,7 @@ private Q_SLOTS: QCOMPARE(nodeRemovedChange->propertyName(), "renderState"); QCOMPARE(nodeRemovedChange->subjectId(), stateSet->id()); QCOMPARE(nodeRemovedChange->removedNodeId(), state1->id()); - QCOMPARE(nodeRemovedChange->type(), Qt3DCore::NodeRemoved); + QCOMPARE(nodeRemovedChange->type(), Qt3DCore::PropertyValueRemoved); arbiter.events.clear(); } diff --git a/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp b/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp index 64bdd275d..f626f4827 100644 --- a/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp +++ b/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp @@ -115,7 +115,7 @@ private Q_SLOTS: QCOMPARE(change->propertyName(), "sortType"); QCOMPARE(change->subjectId(),sortPolicy->id()); QCOMPARE(change->value().value<Qt3DRender::QSortPolicy::SortType>(), sortType1); - QCOMPARE(change->type(), Qt3DCore::NodeAdded); + QCOMPARE(change->type(), Qt3DCore::PropertyValueAdded); arbiter.events.clear(); @@ -136,7 +136,7 @@ private Q_SLOTS: QCOMPARE(change->propertyName(), "sortType"); QCOMPARE(change->subjectId(), sortPolicy->id()); QCOMPARE(change->value().value<Qt3DRender::QSortPolicy::SortType>(), sortType1); - QCOMPARE(change->type(), Qt3DCore::NodeRemoved); + QCOMPARE(change->type(), Qt3DCore::PropertyValueRemoved); arbiter.events.clear(); } diff --git a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp index 6b6e849d7..027637934 100644 --- a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp +++ b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp @@ -163,7 +163,7 @@ private Q_SLOTS: QCOMPARE(nodeAddedChange->propertyName(), "parameter"); QCOMPARE(nodeAddedChange->subjectId(),techniqueFilter->id()); QCOMPARE(nodeAddedChange->addedNodeId(), param1->id()); - QCOMPARE(nodeAddedChange->type(), Qt3DCore::NodeAdded); + QCOMPARE(nodeAddedChange->type(), Qt3DCore::PropertyValueAdded); arbiter.events.clear(); @@ -184,7 +184,7 @@ private Q_SLOTS: QCOMPARE(nodeRemovedChange->propertyName(), "parameter"); QCOMPARE(nodeRemovedChange->subjectId(), techniqueFilter->id()); QCOMPARE(nodeRemovedChange->removedNodeId(), param1->id()); - QCOMPARE(nodeRemovedChange->type(), Qt3DCore::NodeRemoved); + QCOMPARE(nodeRemovedChange->type(), Qt3DCore::PropertyValueRemoved); arbiter.events.clear(); @@ -199,7 +199,7 @@ private Q_SLOTS: QCOMPARE(nodeAddedChange->propertyName(), "matchAll"); QCOMPARE(nodeAddedChange->subjectId(),techniqueFilter->id()); QCOMPARE(nodeAddedChange->addedNodeId(), filterKey1->id()); - QCOMPARE(nodeAddedChange->type(), Qt3DCore::NodeAdded); + QCOMPARE(nodeAddedChange->type(), Qt3DCore::PropertyValueAdded); arbiter.events.clear(); @@ -220,7 +220,7 @@ private Q_SLOTS: QCOMPARE(nodeRemovedChange->propertyName(), "matchAll"); QCOMPARE(nodeRemovedChange->subjectId(), techniqueFilter->id()); QCOMPARE(nodeRemovedChange->removedNodeId(), filterKey1->id()); - QCOMPARE(nodeRemovedChange->type(), Qt3DCore::NodeRemoved); + QCOMPARE(nodeRemovedChange->type(), Qt3DCore::PropertyValueRemoved); arbiter.events.clear(); } |