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 /src/render | |
| 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 'src/render')
78 files changed, 177 insertions, 177 deletions
diff --git a/src/render/backend/boundingvolumedebug.cpp b/src/render/backend/boundingvolumedebug.cpp index d6226dbc7..d1259fe06 100644 --- a/src/render/backend/boundingvolumedebug.cpp +++ b/src/render/backend/boundingvolumedebug.cpp @@ -75,7 +75,7 @@ void BoundingVolumeDebug::updateFromPeer(Qt3DCore::QNode *peer) void BoundingVolumeDebug::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - const Qt3DCore::QScenePropertyChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QScenePropertyChange>(e); + const Qt3DCore::QNodePropertyChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QNodePropertyChange>(e); const QByteArray propertyName = propertyChange->propertyName(); if (propertyChange->type() == Qt3DCore::NodeUpdated) { diff --git a/src/render/backend/cameralens.cpp b/src/render/backend/cameralens.cpp index 1c22536b6..df1b3e29e 100644 --- a/src/render/backend/cameralens.cpp +++ b/src/render/backend/cameralens.cpp @@ -42,7 +42,7 @@ #include <Qt3DRender/private/qcameralens_p.h> #include <Qt3DRender/private/renderlogging_p.h> #include <Qt3DCore/qentity.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/qtransform.h> QT_BEGIN_NAMESPACE @@ -89,7 +89,7 @@ void CameraLens::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { case NodeUpdated: { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("projectionMatrix")) { QMatrix4x4 projectionMatrix = propertyChange->value().value<QMatrix4x4>(); diff --git a/src/render/backend/computecommand.cpp b/src/render/backend/computecommand.cpp index fc73c4530..959dabb58 100644 --- a/src/render/backend/computecommand.cpp +++ b/src/render/backend/computecommand.cpp @@ -39,7 +39,7 @@ #include "computecommand_p.h" #include <Qt3DCore/qnode.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/qcomputecommand.h> #include <Qt3DRender/private/abstractrenderer_p.h> @@ -81,7 +81,7 @@ void ComputeCommand::updateFromPeer(Qt3DCore::QNode *peer) void ComputeCommand::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - Qt3DCore::QScenePropertyChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QScenePropertyChange>(e); + Qt3DCore::QNodePropertyChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QNodePropertyChange>(e); if (e->type() == Qt3DCore::NodeUpdated) { if (propertyChange->propertyName() == QByteArrayLiteral("workGroupX")) m_workGroups[0] = propertyChange->value().toInt(); diff --git a/src/render/backend/entity.cpp b/src/render/backend/entity.cpp index 8728159c3..b1a51f892 100644 --- a/src/render/backend/entity.cpp +++ b/src/render/backend/entity.cpp @@ -57,7 +57,7 @@ #include <Qt3DCore/qcomponentaddedchange.h> #include <Qt3DCore/qcomponentremovedchange.h> #include <Qt3DCore/qentity.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/qtransform.h> #include <Qt3DCore/private/qentity_p.h> diff --git a/src/render/backend/layer.cpp b/src/render/backend/layer.cpp index 6a17f0fff..443496272 100644 --- a/src/render/backend/layer.cpp +++ b/src/render/backend/layer.cpp @@ -39,7 +39,7 @@ #include "layer_p.h" #include "qlayer.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/private/stringtoint_p.h> #include <QVariant> @@ -82,7 +82,7 @@ QStringList Layer::layers() const void Layer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); if (e->type() == NodeUpdated && propertyChange->propertyName() == QByteArrayLiteral("names")) { m_layers = propertyChange->value().toStringList(); m_layerIds.clear(); diff --git a/src/render/backend/rendersettings.cpp b/src/render/backend/rendersettings.cpp index b465159b5..2db27c8f2 100644 --- a/src/render/backend/rendersettings.cpp +++ b/src/render/backend/rendersettings.cpp @@ -42,7 +42,7 @@ #include <Qt3DRender/QFrameGraphNode> #include <Qt3DRender/private/abstractrenderer_p.h> #include <Qt3DRender/private/qrendersettings_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -87,7 +87,7 @@ void RenderSettings::cleanup() void RenderSettings::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("pickMethod")) m_pickMethod = propertyChange->value().value<QPickingSettings::PickMethod>(); else if (propertyChange->propertyName() == QByteArrayLiteral("pickResult")) diff --git a/src/render/backend/rendertarget.cpp b/src/render/backend/rendertarget.cpp index eef6e0d81..7a88f67d6 100644 --- a/src/render/backend/rendertarget.cpp +++ b/src/render/backend/rendertarget.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include <Qt3DRender/private/rendertarget_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/qrendertarget.h> #include <Qt3DRender/qrendertargetoutput.h> #include <QVariant> @@ -86,7 +86,7 @@ QVector<Qt3DCore::QNodeId> RenderTarget::renderOutputs() const void RenderTarget::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); if (e->type() == NodeAdded && propertyChange->propertyName() == QByteArrayLiteral("output")) appendRenderOutput(propertyChange->value().value<QNodeId>()); else if (e->type() == NodeRemoved && propertyChange->propertyName() == QByteArrayLiteral("output")) diff --git a/src/render/backend/rendertargetoutput.cpp b/src/render/backend/rendertargetoutput.cpp index a031e6ff3..917a6c332 100644 --- a/src/render/backend/rendertargetoutput.cpp +++ b/src/render/backend/rendertargetoutput.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include <Qt3DRender/private/rendertargetoutput_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/qtexture.h> #include <QVariant> @@ -98,7 +98,7 @@ QRenderTargetOutput::AttachmentPoint RenderTargetOutput::point() const void RenderTargetOutput::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); if (e->type() == NodeUpdated) { if (propertyChange->propertyName() == QByteArrayLiteral("type")) { m_attachmentData.m_point = static_cast<QRenderTargetOutput::AttachmentPoint>(propertyChange->value().toInt()); diff --git a/src/render/backend/transform.cpp b/src/render/backend/transform.cpp index a764eb21a..f639fda98 100644 --- a/src/render/backend/transform.cpp +++ b/src/render/backend/transform.cpp @@ -39,7 +39,7 @@ #include "transform_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/private/qchangearbiter_p.h> #include <Qt3DCore/qtransform.h> #include <Qt3DCore/private/qtransform_p.h> @@ -88,7 +88,7 @@ void Transform::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { // TODO: Flag the matrix as dirty and update all matrices batched in a job if (e->type() == NodeUpdated) { - const QScenePropertyChangePtr &propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + const QNodePropertyChangePtr &propertyChange = qSharedPointerCast<QNodePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("scale3D")) { m_scale = propertyChange->value().value<QVector3D>(); updateMatrix(); diff --git a/src/render/framegraph/cameraselectornode.cpp b/src/render/framegraph/cameraselectornode.cpp index c000d5a1c..2ed148ee9 100644 --- a/src/render/framegraph/cameraselectornode.cpp +++ b/src/render/framegraph/cameraselectornode.cpp @@ -42,7 +42,7 @@ #include <Qt3DRender/private/renderer_p.h> #include <Qt3DCore/private/qchangearbiter_p.h> #include <Qt3DCore/qentity.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/private/renderlogging_p.h> QT_BEGIN_NAMESPACE @@ -77,7 +77,7 @@ void CameraSelector::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { qCDebug(Render::Framegraph) << Q_FUNC_INFO; if (e->type() == NodeUpdated) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("camera")) m_cameraUuid = propertyChange->value().value<QNodeId>(); markDirty(AbstractRenderer::AllDirty); diff --git a/src/render/framegraph/clearbuffers.cpp b/src/render/framegraph/clearbuffers.cpp index a96ddc709..7b6bc4c83 100644 --- a/src/render/framegraph/clearbuffers.cpp +++ b/src/render/framegraph/clearbuffers.cpp @@ -39,7 +39,7 @@ #include "clearbuffers_p.h" #include <Qt3DRender/private/qclearbuffers_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -79,7 +79,7 @@ void ClearBuffers::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr void ClearBuffers::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("buffers")) m_type = static_cast<QClearBuffers::BufferType>(propertyChange->value().toInt()); else if (propertyChange->propertyName() == QByteArrayLiteral("clearColor")) diff --git a/src/render/framegraph/dispatchcompute.cpp b/src/render/framegraph/dispatchcompute.cpp index a38126251..5cd8e9e45 100644 --- a/src/render/framegraph/dispatchcompute.cpp +++ b/src/render/framegraph/dispatchcompute.cpp @@ -39,7 +39,7 @@ #include "dispatchcompute_p.h" #include <Qt3DRender/private/qdispatchcompute_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -87,7 +87,7 @@ void DispatchCompute::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBaseP void DispatchCompute::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == Qt3DCore::NodeUpdated) { - Qt3DCore::QScenePropertyChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QScenePropertyChange>(e); + Qt3DCore::QNodePropertyChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QNodePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("workGroupX")) m_workGroups[0] = propertyChange->value().toInt(); else if (propertyChange->propertyName() == QByteArrayLiteral("workGroupY")) diff --git a/src/render/framegraph/frustumculling.cpp b/src/render/framegraph/frustumculling.cpp index fbbc0a3e0..6ccb9ed11 100644 --- a/src/render/framegraph/frustumculling.cpp +++ b/src/render/framegraph/frustumculling.cpp @@ -39,7 +39,7 @@ #include "frustumculling_p.h" #include <Qt3DRender/qfrustumculling.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/layerfilternode.cpp b/src/render/framegraph/layerfilternode.cpp index 829fb8b82..998a320f0 100644 --- a/src/render/framegraph/layerfilternode.cpp +++ b/src/render/framegraph/layerfilternode.cpp @@ -40,7 +40,7 @@ #include "layerfilternode_p.h" #include "qlayerfilter.h" #include <Qt3DRender/private/qlayerfilter_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/private/stringtoint_p.h> QT_BEGIN_NAMESPACE @@ -72,7 +72,7 @@ void LayerFilterNode::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBaseP void LayerFilterNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("layers")) setLayers(propertyChange->value().value<QStringList>()); markDirty(AbstractRenderer::AllDirty); diff --git a/src/render/framegraph/nodraw.cpp b/src/render/framegraph/nodraw.cpp index 602969249..771ebc7b6 100644 --- a/src/render/framegraph/nodraw.cpp +++ b/src/render/framegraph/nodraw.cpp @@ -39,7 +39,7 @@ #include "nodraw_p.h" #include <Qt3DRender/qnodraw.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qcameraselector.cpp b/src/render/framegraph/qcameraselector.cpp index a8f5b6010..f8341304d 100644 --- a/src/render/framegraph/qcameraselector.cpp +++ b/src/render/framegraph/qcameraselector.cpp @@ -41,7 +41,7 @@ #include "qcameraselector_p.h" #include <Qt3DCore/qentity.h> #include <Qt3DCore/private/qentity_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qclearbuffers.cpp b/src/render/framegraph/qclearbuffers.cpp index eda687381..e89436c3f 100644 --- a/src/render/framegraph/qclearbuffers.cpp +++ b/src/render/framegraph/qclearbuffers.cpp @@ -39,7 +39,7 @@ #include "qclearbuffers.h" #include "qclearbuffers_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qlayerfilter.cpp b/src/render/framegraph/qlayerfilter.cpp index a7c9c4a18..eeeb3d2bb 100644 --- a/src/render/framegraph/qlayerfilter.cpp +++ b/src/render/framegraph/qlayerfilter.cpp @@ -39,7 +39,7 @@ #include "qlayerfilter.h" #include "qlayerfilter_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp index 35bd7cbb9..5df3b638d 100644 --- a/src/render/framegraph/qrenderpassfilter.cpp +++ b/src/render/framegraph/qrenderpassfilter.cpp @@ -40,7 +40,7 @@ #include "qrenderpassfilter.h" #include "qrenderpassfilter_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/qfilterkey.h> #include <Qt3DRender/qparameter.h> @@ -86,7 +86,7 @@ void QRenderPassFilter::addMatch(QFilterKey *keyFilter) keyFilter->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); + QNodePropertyChangePtr propertyChange(new QNodePropertyChange(NodeAdded, QSceneChange::Node, id())); propertyChange->setPropertyName("match"); propertyChange->setValue(QVariant::fromValue(keyFilter->id())); d->notifyObservers(propertyChange); @@ -98,7 +98,7 @@ void QRenderPassFilter::removeMatch(QFilterKey *filterKey) { Q_D(QRenderPassFilter); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); + QNodePropertyChangePtr propertyChange(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, id())); propertyChange->setPropertyName("match"); propertyChange->setValue(QVariant::fromValue(filterKey->id())); d->notifyObservers(propertyChange); @@ -130,7 +130,7 @@ void QRenderPassFilter::addParameter(QParameter *parameter) parameter->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeAdded, QSceneChange::Node, id())); change->setPropertyName("parameter"); change->setValue(QVariant::fromValue(parameter->id())); d->notifyObservers(change); @@ -143,7 +143,7 @@ void QRenderPassFilter::removeParameter(QParameter *parameter) Q_D(QRenderPassFilter); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, id())); change->setPropertyName("parameter"); change->setValue(QVariant::fromValue(parameter->id())); d->notifyObservers(change); diff --git a/src/render/framegraph/qrenderstateset.cpp b/src/render/framegraph/qrenderstateset.cpp index 7d1b1cc8b..e82446dc1 100644 --- a/src/render/framegraph/qrenderstateset.cpp +++ b/src/render/framegraph/qrenderstateset.cpp @@ -40,7 +40,7 @@ #include "qrenderstateset.h" #include "qrenderstateset_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -114,7 +114,7 @@ void QRenderStateSet::addRenderState(QRenderState *state) state->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeAdded, QSceneChange::Node, id())); change->setPropertyName("renderState"); // Since we have no RenderState managers, we need to send a clone change->setValue(QVariant::fromValue(QNodePtr(QNode::clone(state)))); @@ -130,7 +130,7 @@ void QRenderStateSet::removeRenderState(QRenderState *state) { Q_D(QRenderStateSet); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, id())); change->setPropertyName("renderState"); change->setValue(QVariant::fromValue(state->id())); d->notifyObservers(change); diff --git a/src/render/framegraph/qrendersurfaceselector.cpp b/src/render/framegraph/qrendersurfaceselector.cpp index 0ef2c6203..44902f317 100644 --- a/src/render/framegraph/qrendersurfaceselector.cpp +++ b/src/render/framegraph/qrendersurfaceselector.cpp @@ -42,7 +42,7 @@ #include <QtGui/qwindow.h> #include <QtGui/qoffscreensurface.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -175,8 +175,8 @@ void QRenderSurfaceSelector::setSurface(QObject *surfaceObject) if (window) { QObject::connect(window, &QWindow::widthChanged, [=] (int width) { if (d->m_changeArbiter != Q_NULLPTR) { - Qt3DCore::QScenePropertyChangePtr change( - new Qt3DCore::QScenePropertyChange( + Qt3DCore::QNodePropertyChangePtr change( + new Qt3DCore::QNodePropertyChange( Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, id())); @@ -188,8 +188,8 @@ void QRenderSurfaceSelector::setSurface(QObject *surfaceObject) }); QObject::connect(window, &QWindow::heightChanged, [=] (int height) { if (d->m_changeArbiter != Q_NULLPTR) { - Qt3DCore::QScenePropertyChangePtr change( - new Qt3DCore::QScenePropertyChange( + Qt3DCore::QNodePropertyChangePtr change( + new Qt3DCore::QNodePropertyChange( Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, id())); diff --git a/src/render/framegraph/qrendertargetselector.cpp b/src/render/framegraph/qrendertargetselector.cpp index 265dc1dc5..33d8070a9 100644 --- a/src/render/framegraph/qrendertargetselector.cpp +++ b/src/render/framegraph/qrendertargetselector.cpp @@ -40,7 +40,7 @@ #include "qrendertargetselector.h" #include "qrendertargetselector_p.h" #include <Qt3DRender/qrendertarget.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/private/qrenderpass_p.h> QT_BEGIN_NAMESPACE @@ -113,7 +113,7 @@ void QRenderTargetSelector::setOutputs(const QVector<QRenderTargetOutput::Attach d->m_outputs = buffers; if (d->m_changeArbiter) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeUpdated, QSceneChange::Node, id())); change->setPropertyName("outputs"); change->setValue(QVariant::fromValue(d->m_outputs)); d->notifyObservers(change); diff --git a/src/render/framegraph/qsortcriterion.cpp b/src/render/framegraph/qsortcriterion.cpp index c83647854..cc5d38769 100644 --- a/src/render/framegraph/qsortcriterion.cpp +++ b/src/render/framegraph/qsortcriterion.cpp @@ -39,7 +39,7 @@ #include "qsortcriterion.h" #include "qsortcriterion_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qsortpolicy.cpp b/src/render/framegraph/qsortpolicy.cpp index c012e343a..c9509adfd 100644 --- a/src/render/framegraph/qsortpolicy.cpp +++ b/src/render/framegraph/qsortpolicy.cpp @@ -40,7 +40,7 @@ #include "qsortpolicy.h" #include "qsortpolicy_p.h" #include "qsortcriterion_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/qsortcriterion.h> QT_BEGIN_NAMESPACE @@ -88,7 +88,7 @@ void QSortPolicy::addCriterion(QSortCriterion *criterion) criterion->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); + QNodePropertyChangePtr propertyChange(new QNodePropertyChange(NodeAdded, QSceneChange::Node, id())); propertyChange->setPropertyName("sortCriterion"); propertyChange->setValue(QVariant::fromValue(criterion->id())); d->notifyObservers(propertyChange); @@ -100,7 +100,7 @@ void QSortPolicy::removeCriterion(QSortCriterion *criterion) { Q_D(QSortPolicy); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); + QNodePropertyChangePtr propertyChange(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, id())); propertyChange->setPropertyName("sortCriterion"); propertyChange->setValue(QVariant::fromValue(criterion->id())); d->notifyObservers(propertyChange); diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp index 58ab207de..95aa70ef3 100644 --- a/src/render/framegraph/qtechniquefilter.cpp +++ b/src/render/framegraph/qtechniquefilter.cpp @@ -42,7 +42,7 @@ #include "qtechniquefilter_p.h" #include <Qt3DRender/qfilterkey.h> #include <Qt3DRender/qparameter.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -102,7 +102,7 @@ void QTechniqueFilter::addMatch(QFilterKey *criterion) criterion->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); + QNodePropertyChangePtr propertyChange(new QNodePropertyChange(NodeAdded, QSceneChange::Node, id())); propertyChange->setPropertyName("require"); propertyChange->setValue(QVariant::fromValue(criterion->id())); d->notifyObservers(propertyChange); @@ -114,7 +114,7 @@ void QTechniqueFilter::removeMatch(QFilterKey *criterion) { Q_D(QTechniqueFilter); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); + QNodePropertyChangePtr propertyChange(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, id())); propertyChange->setPropertyName("require"); propertyChange->setValue(QVariant::fromValue(criterion->id())); d->notifyObservers(propertyChange); @@ -136,7 +136,7 @@ void QTechniqueFilter::addParameter(QParameter *parameter) parameter->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeAdded, QSceneChange::Node, id())); change->setPropertyName("parameter"); change->setValue(QVariant::fromValue(parameter->id())); d->notifyObservers(change); @@ -149,7 +149,7 @@ void QTechniqueFilter::removeParameter(QParameter *parameter) Q_D(QTechniqueFilter); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, id())); change->setPropertyName("parameter"); change->setValue(QVariant::fromValue(parameter->id())); d->notifyObservers(change); diff --git a/src/render/framegraph/qviewport.cpp b/src/render/framegraph/qviewport.cpp index 3e5a35d7d..a3b113522 100644 --- a/src/render/framegraph/qviewport.cpp +++ b/src/render/framegraph/qviewport.cpp @@ -40,7 +40,7 @@ #include "qviewport.h" #include "qviewport_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/renderpassfilternode.cpp b/src/render/framegraph/renderpassfilternode.cpp index 5b581a6ac..9ad28e0bd 100644 --- a/src/render/framegraph/renderpassfilternode.cpp +++ b/src/render/framegraph/renderpassfilternode.cpp @@ -41,7 +41,7 @@ #include "qfilterkey.h" #include "qrenderpassfilter.h" #include <Qt3DRender/private/qrenderpassfilter_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/qparameter.h> QT_BEGIN_NAMESPACE @@ -101,7 +101,7 @@ QVector<Qt3DCore::QNodeId> RenderPassFilter::parameters() const void RenderPassFilter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); switch (e->type()) { diff --git a/src/render/framegraph/rendersurfaceselector.cpp b/src/render/framegraph/rendersurfaceselector.cpp index aac37cedd..2b818e936 100644 --- a/src/render/framegraph/rendersurfaceselector.cpp +++ b/src/render/framegraph/rendersurfaceselector.cpp @@ -40,7 +40,7 @@ #include "rendersurfaceselector_p.h" #include <Qt3DRender/qrendersurfaceselector.h> #include <Qt3DRender/private/qrendersurfaceselector_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <QtGui/qwindow.h> #include <QtGui/qscreen.h> @@ -116,7 +116,7 @@ void RenderSurfaceSelector::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { qCDebug(Render::Framegraph) << Q_FUNC_INFO; if (e->type() == NodeUpdated) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("surface")) m_surface = surfaceFromQObject(propertyChange->value().value<QObject *>()); else if (propertyChange->propertyName() == QByteArrayLiteral("externalRenderTargetSize")) diff --git a/src/render/framegraph/rendertargetselectornode.cpp b/src/render/framegraph/rendertargetselectornode.cpp index d763a9d9b..99d6fc965 100644 --- a/src/render/framegraph/rendertargetselectornode.cpp +++ b/src/render/framegraph/rendertargetselectornode.cpp @@ -43,7 +43,7 @@ #include <Qt3DRender/qrendertargetselector.h> #include <Qt3DRender/private/qrendertargetselector_p.h> #include <Qt3DRender/qrendertarget.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/private/renderlogging_p.h> #include <Qt3DRender/qrendertargetoutput.h> @@ -81,7 +81,7 @@ void RenderTargetSelector::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { qCDebug(Render::Framegraph) << Q_FUNC_INFO; if (e->type() == NodeUpdated) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("target")) m_renderTargetUuid = propertyChange->value().value<QNodeId>(); else if (propertyChange->propertyName() == QByteArrayLiteral("outputs")) diff --git a/src/render/framegraph/sortcriterion.cpp b/src/render/framegraph/sortcriterion.cpp index ce555a170..9854d991f 100644 --- a/src/render/framegraph/sortcriterion.cpp +++ b/src/render/framegraph/sortcriterion.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "sortcriterion_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <QVariant> QT_BEGIN_NAMESPACE @@ -72,7 +72,7 @@ QSortCriterion::SortType SortCriterion::sortType() const void SortCriterion::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); if (e->type() == NodeUpdated && propertyChange->propertyName() == QByteArrayLiteral("sort")) { m_type = static_cast<QSortCriterion::SortType>(propertyChange->value().toInt()); } diff --git a/src/render/framegraph/sortpolicy.cpp b/src/render/framegraph/sortpolicy.cpp index 52c24afc3..66d362a27 100644 --- a/src/render/framegraph/sortpolicy.cpp +++ b/src/render/framegraph/sortpolicy.cpp @@ -39,7 +39,7 @@ #include "sortpolicy_p.h" #include <Qt3DRender/qsortcriterion.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -63,7 +63,7 @@ void SortPolicy::updateFromPeer(Qt3DCore::QNode *peer) void SortPolicy::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("sortCriterion")) { const QNodeId cId = propertyChange->value().value<QNodeId>(); if (!cId.isNull()) { diff --git a/src/render/framegraph/statesetnode.cpp b/src/render/framegraph/statesetnode.cpp index 951f703e8..2338f3e18 100644 --- a/src/render/framegraph/statesetnode.cpp +++ b/src/render/framegraph/statesetnode.cpp @@ -39,7 +39,7 @@ #include "statesetnode_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/qrenderstateset.h> #include <Qt3DRender/private/qrenderstateset_p.h> #include <Qt3DRender/private/genericstate_p.h> @@ -81,7 +81,7 @@ void StateSetNode::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr void StateSetNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); switch (e->type()) { case NodeAdded: { if (propertyChange->propertyName() == QByteArrayLiteral("renderState")) { diff --git a/src/render/framegraph/techniquefilternode.cpp b/src/render/framegraph/techniquefilternode.cpp index 8a28d3ca6..20a80e1db 100644 --- a/src/render/framegraph/techniquefilternode.cpp +++ b/src/render/framegraph/techniquefilternode.cpp @@ -42,7 +42,7 @@ #include "qtechniquefilter.h" #include <Qt3DRender/private/qtechniquefilter_p.h> #include <Qt3DRender/private/managers_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/qparameter.h> QT_BEGIN_NAMESPACE @@ -102,7 +102,7 @@ void TechniqueFilter::removeFilter(Qt3DCore::QNodeId criterionId) void TechniqueFilter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); switch (e->type()) { diff --git a/src/render/framegraph/viewportnode.cpp b/src/render/framegraph/viewportnode.cpp index 35842c3eb..e0b3d62bc 100644 --- a/src/render/framegraph/viewportnode.cpp +++ b/src/render/framegraph/viewportnode.cpp @@ -40,7 +40,7 @@ #include "viewportnode_p.h" #include <Qt3DRender/qviewport.h> #include <Qt3DRender/private/qviewport_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -118,7 +118,7 @@ void ViewportNode::setYMax(float yMax) void ViewportNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("normalizedRect")) { QRectF normalizedRect = propertyChange->value().value<QRectF>(); setXMin(normalizedRect.x()); diff --git a/src/render/frontend/qcameralens_p.h b/src/render/frontend/qcameralens_p.h index 2a34599f8..65137c0b9 100644 --- a/src/render/frontend/qcameralens_p.h +++ b/src/render/frontend/qcameralens_p.h @@ -54,7 +54,7 @@ #include <Qt3DCore/private/qcomponent_p.h> #include "qcameralens.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <QtGui/qmatrix4x4.h> diff --git a/src/render/frontend/qrendertarget.cpp b/src/render/frontend/qrendertarget.cpp index 31c95f591..2257e9043 100644 --- a/src/render/frontend/qrendertarget.cpp +++ b/src/render/frontend/qrendertarget.cpp @@ -40,7 +40,7 @@ #include "qrendertarget.h" #include "qrendertarget_p.h" #include "qrendertargetoutput.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -87,7 +87,7 @@ void QRenderTarget::addOutput(QRenderTargetOutput *output) output->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeAdded, QSceneChange::Node, id())); change->setPropertyName("output"); change->setValue(QVariant::fromValue(output->id())); d->notifyObservers(change); @@ -100,7 +100,7 @@ void QRenderTarget::removeOutput(QRenderTargetOutput *output) Q_D(QRenderTarget); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, id())); change->setPropertyName("output"); change->setValue(QVariant::fromValue(output->id())); d->notifyObservers(change); diff --git a/src/render/frontend/qrendertargetoutput.cpp b/src/render/frontend/qrendertargetoutput.cpp index 27bd48a4a..4d9d4e36c 100644 --- a/src/render/frontend/qrendertargetoutput.cpp +++ b/src/render/frontend/qrendertargetoutput.cpp @@ -39,7 +39,7 @@ #include "qrendertargetoutput_p.h" #include "qrendertargetoutput.h" #include "qtexture.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/attribute.cpp b/src/render/geometry/attribute.cpp index e31485ad6..ebf4dae8d 100644 --- a/src/render/geometry/attribute.cpp +++ b/src/render/geometry/attribute.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "attribute_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/qbuffer.h> #include <Qt3DRender/private/qattribute_p.h> #include <Qt3DRender/private/stringtoint_p.h> @@ -123,7 +123,7 @@ void Attribute::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { case NodeUpdated: { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); QByteArray propertyName = propertyChange->propertyName(); if (propertyName == QByteArrayLiteral("name")) { diff --git a/src/render/geometry/buffer.cpp b/src/render/geometry/buffer.cpp index 6ec55155e..9d9ac892c 100644 --- a/src/render/geometry/buffer.cpp +++ b/src/render/geometry/buffer.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "buffer_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/qbackendscenepropertychange.h> #include <Qt3DRender/private/buffermanager_p.h> #include <Qt3DRender/private/qbuffer_p.h> @@ -131,7 +131,7 @@ void Buffer::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &chang void Buffer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); QByteArray propertyName = propertyChange->propertyName(); if (propertyName == QByteArrayLiteral("data")) { QByteArray newData = propertyChange->value().value<QByteArray>(); diff --git a/src/render/geometry/geometry.cpp b/src/render/geometry/geometry.cpp index eccdd0fe7..612e4f4e9 100644 --- a/src/render/geometry/geometry.cpp +++ b/src/render/geometry/geometry.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "geometry_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/qattribute.h> #include <Qt3DRender/qgeometry.h> #include <Qt3DRender/private/qgeometry_p.h> @@ -95,7 +95,7 @@ void Geometry::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) switch (e->type()) { case NodeAdded: { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); QByteArray propertyName = propertyChange->propertyName(); if (propertyName == QByteArrayLiteral("attribute")) { @@ -106,7 +106,7 @@ void Geometry::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) } case NodeRemoved: { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); QByteArray propertyName = propertyChange->propertyName(); if (propertyName == QByteArrayLiteral("attribute")) { @@ -119,7 +119,7 @@ void Geometry::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) case NodeUpdated: { // Note: doesn't set dirtyness as this parameter changing doesn't need // a new VAO update. - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); QByteArray propertyName = propertyChange->propertyName(); if (propertyName == QByteArrayLiteral("boundingVolumePositionAttribute")) { diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp index a9af8fd41..4af82c611 100644 --- a/src/render/geometry/geometryrenderer.cpp +++ b/src/render/geometry/geometryrenderer.cpp @@ -39,7 +39,7 @@ #include "geometryrenderer_p.h" #include <Qt3DCore/private/qnode_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/private/geometryrenderermanager_p.h> #include <Qt3DCore/qbackendscenepropertychange.h> #include <Qt3DRender/private/qboundingvolume_p.h> @@ -140,7 +140,7 @@ void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { case NodeUpdated: { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); QByteArray propertyName = propertyChange->propertyName(); if (propertyName == QByteArrayLiteral("instanceCount")) { @@ -178,7 +178,7 @@ void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) } case NodeAdded: { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); QByteArray propertyName = propertyChange->propertyName(); if (propertyName == QByteArrayLiteral("geometry")) { @@ -189,7 +189,7 @@ void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) } case NodeRemoved: { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); QByteArray propertyName = propertyChange->propertyName(); if (propertyName == QByteArrayLiteral("geometry")) { diff --git a/src/render/geometry/qattribute.cpp b/src/render/geometry/qattribute.cpp index a0af3b259..d9467dd82 100644 --- a/src/render/geometry/qattribute.cpp +++ b/src/render/geometry/qattribute.cpp @@ -41,7 +41,7 @@ #include "qattribute_p.h" #include <Qt3DRender/qbuffer.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qbuffer.cpp b/src/render/geometry/qbuffer.cpp index dee8053e8..b5a0b99a0 100644 --- a/src/render/geometry/qbuffer.cpp +++ b/src/render/geometry/qbuffer.cpp @@ -40,7 +40,7 @@ #include "qbuffer.h" #include "qbuffer_p.h" #include <Qt3DRender/private/renderlogging_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -180,7 +180,7 @@ void QBuffer::copy(const QNode *ref) */ void QBuffer::sceneChangeEvent(const QSceneChangePtr &change) { - QScenePropertyChangePtr e = qSharedPointerCast<QScenePropertyChange>(change); + QNodePropertyChangePtr e = qSharedPointerCast<QNodePropertyChange>(change); if (e->type() == NodeUpdated && e->propertyName() == QByteArrayLiteral("data")) { const bool blocked = blockNotifications(true); setData(e->value().toByteArray()); @@ -251,7 +251,7 @@ void QBuffer::setDataGenerator(const QBufferDataGeneratorPtr &functor) return; d->m_functor = functor; if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeUpdated, QSceneChange::Node, id())); change->setPropertyName("dataGenerator"); change->setValue(QVariant::fromValue(d->m_functor)); d->notifyObservers(change); diff --git a/src/render/geometry/qgeometry.cpp b/src/render/geometry/qgeometry.cpp index 2be30de01..514003211 100644 --- a/src/render/geometry/qgeometry.cpp +++ b/src/render/geometry/qgeometry.cpp @@ -40,7 +40,7 @@ #include "qgeometry.h" #include "qgeometry_p.h" #include <private/qnode_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/qattribute.h> QT_BEGIN_NAMESPACE @@ -117,7 +117,7 @@ void QGeometry::addAttribute(QAttribute *attribute) attribute->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeAdded, QSceneChange::Node, id())); change->setPropertyName("attribute"); change->setValue(QVariant::fromValue(attribute->id())); d->notifyObservers(change); @@ -132,7 +132,7 @@ void QGeometry::removeAttribute(QAttribute *attribute) { Q_D(QGeometry); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, id())); change->setPropertyName("attribute"); change->setValue(QVariant::fromValue(attribute->id())); d->notifyObservers(change); diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp index 3176c647d..35146974d 100644 --- a/src/render/geometry/qgeometryrenderer.cpp +++ b/src/render/geometry/qgeometryrenderer.cpp @@ -41,7 +41,7 @@ #include "qgeometryrenderer_p.h" #include <private/qcomponent_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -358,7 +358,7 @@ void QGeometryRenderer::setGeometry(QGeometry *geometry) return; if (d->m_geometry && d->m_changeArbiter) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, id())); change->setPropertyName("geometry"); change->setValue(QVariant::fromValue(d->m_geometry->id())); d->notifyObservers(change); @@ -373,7 +373,7 @@ void QGeometryRenderer::setGeometry(QGeometry *geometry) blockNotifications(blocked); if (d->m_geometry && d->m_changeArbiter) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeAdded, QSceneChange::Node, id())); change->setPropertyName("geometry"); change->setValue(QVariant::fromValue(d->m_geometry->id())); d->notifyObservers(change); @@ -400,7 +400,7 @@ void QGeometryRenderer::setGeometryFactory(const QGeometryFactoryPtr &factory) return; d->m_geometryFactory = factory; if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeUpdated, QSceneChange::Node, id())); change->setPropertyName("geometryFactory"); change->setValue(QVariant::fromValue(d->m_geometryFactory)); d->notifyObservers(change); @@ -432,7 +432,7 @@ void QGeometryRenderer::copy(const QNode *ref) void QGeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { Q_D(QGeometryRenderer); - QScenePropertyChangePtr change = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr change = qSharedPointerCast<QNodePropertyChange>(e); if (change->type() == NodeUpdated && change->propertyName() == QByteArrayLiteral("geometry")) { QNodePtr nodePtr = change->value().value<QNodePtr>(); QGeometry *backendGeometry = static_cast<QGeometry *>(nodePtr.data()); diff --git a/src/render/geometry/qmesh.cpp b/src/render/geometry/qmesh.cpp index da78eaed3..ef9a793f9 100644 --- a/src/render/geometry/qmesh.cpp +++ b/src/render/geometry/qmesh.cpp @@ -44,7 +44,7 @@ #include <QFile> #include <QFileInfo> #include <Qt3DRender/private/objloader_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/private/renderlogging_p.h> #include <Qt3DRender/private/qurlhelper_p.h> diff --git a/src/render/io/qsceneloader.cpp b/src/render/io/qsceneloader.cpp index de8f0848a..3b5db6a7a 100644 --- a/src/render/io/qsceneloader.cpp +++ b/src/render/io/qsceneloader.cpp @@ -40,7 +40,7 @@ #include "qsceneloader.h" #include "qsceneloader_p.h" #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/qentity.h> #include <Qt3DRender/private/renderlogging_p.h> #include <QThread> @@ -79,7 +79,7 @@ QSceneLoader::~QSceneLoader() void QSceneLoader::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) { Q_D(QSceneLoader); - QScenePropertyChangePtr e = qSharedPointerCast<QScenePropertyChange>(change); + QNodePropertyChangePtr e = qSharedPointerCast<QNodePropertyChange>(change); if (e->type() == NodeUpdated) { if (e->propertyName() == QByteArrayLiteral("scene")) { // If we already have a scene sub tree, delete it diff --git a/src/render/io/scene.cpp b/src/render/io/scene.cpp index ba151c588..51a17efb9 100644 --- a/src/render/io/scene.cpp +++ b/src/render/io/scene.cpp @@ -39,7 +39,7 @@ #include "scene_p.h" #include <Qt3DCore/qentity.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qbackendscenepropertychange.h> @@ -80,7 +80,7 @@ void Scene::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change void Scene::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("source")) { m_source = propertyChange->value().toUrl(); m_sceneManager->addSceneData(m_source, peerId()); diff --git a/src/render/lights/light.cpp b/src/render/lights/light.cpp index 081a47a8e..9193462cb 100644 --- a/src/render/lights/light.cpp +++ b/src/render/lights/light.cpp @@ -39,7 +39,7 @@ #include "light_p.h" #include "qlight.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <private/abstractrenderer_p.h> #include <private/nodemanagers_p.h> #include <private/qbackendnode_p.h> diff --git a/src/render/lights/qdirectionallight.cpp b/src/render/lights/qdirectionallight.cpp index 3287a5ecf..e5265a0fb 100644 --- a/src/render/lights/qdirectionallight.cpp +++ b/src/render/lights/qdirectionallight.cpp @@ -39,7 +39,7 @@ #include "qdirectionallight.h" #include "qdirectionallight_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/lights/qspotlight.cpp b/src/render/lights/qspotlight.cpp index caf8d943e..cb94e2bf5 100644 --- a/src/render/lights/qspotlight.cpp +++ b/src/render/lights/qspotlight.cpp @@ -39,7 +39,7 @@ #include "qspotlight.h" #include "qspotlight_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/effect.cpp b/src/render/materialsystem/effect.cpp index f8cdfa87a..2a549ff0c 100644 --- a/src/render/materialsystem/effect.cpp +++ b/src/render/materialsystem/effect.cpp @@ -43,7 +43,7 @@ #include <Qt3DRender/qparameter.h> #include <Qt3DRender/private/qeffect_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <QVariant> @@ -95,7 +95,7 @@ void Effect::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { case NodeAdded: { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); QVariant propertyValue = propertyChange->value(); if (propertyChange->propertyName() == QByteArrayLiteral("technique")) appendRenderTechnique(propertyValue.value<QNodeId>()); @@ -105,7 +105,7 @@ void Effect::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) } case NodeRemoved: { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); QVariant propertyValue = propertyChange->value(); if (propertyChange->propertyName() == QByteArrayLiteral("technique")) m_techniques.removeOne(propertyValue.value<QNodeId>()); diff --git a/src/render/materialsystem/filterkey.cpp b/src/render/materialsystem/filterkey.cpp index da0bc14dc..2965f9a44 100644 --- a/src/render/materialsystem/filterkey.cpp +++ b/src/render/materialsystem/filterkey.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "filterkey_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/private/qfilterkey_p.h> QT_BEGIN_NAMESPACE @@ -92,7 +92,7 @@ void FilterKey::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { case NodeUpdated: { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("value")) m_value = propertyChange->value(); else if (propertyChange->propertyName() == QByteArrayLiteral("name")) diff --git a/src/render/materialsystem/material.cpp b/src/render/materialsystem/material.cpp index 4ec656b9f..0208d508a 100644 --- a/src/render/materialsystem/material.cpp +++ b/src/render/materialsystem/material.cpp @@ -47,7 +47,7 @@ #include "qeffect.h" #include <Qt3DRender/private/qmaterial_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> using namespace Qt3DCore; @@ -92,7 +92,7 @@ void Material::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &cha void Material::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); switch (e->type()) { case NodeUpdated: { diff --git a/src/render/materialsystem/parameter.cpp b/src/render/materialsystem/parameter.cpp index c0fd8814a..611fec0b1 100644 --- a/src/render/materialsystem/parameter.cpp +++ b/src/render/materialsystem/parameter.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "parameter_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/qparameter.h> #include <Qt3DRender/private/qparameter_p.h> #include <Qt3DRender/qtexture.h> @@ -81,7 +81,7 @@ void Parameter::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &ch void Parameter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); if (e->type() == NodeUpdated) { if (propertyChange->propertyName() == QByteArrayLiteral("name")) { diff --git a/src/render/materialsystem/qeffect.cpp b/src/render/materialsystem/qeffect.cpp index bb134122b..89c356bad 100644 --- a/src/render/materialsystem/qeffect.cpp +++ b/src/render/materialsystem/qeffect.cpp @@ -42,7 +42,7 @@ #include "qtechnique.h" #include "qparameter.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -96,7 +96,7 @@ void QEffect::addParameter(QParameter *parameter) parameter->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeAdded, QSceneChange::Node, id())); change->setPropertyName("parameter"); change->setValue(QVariant::fromValue(parameter->id())); d->notifyObservers(change); @@ -109,7 +109,7 @@ void QEffect::removeParameter(QParameter *parameter) Q_D(QEffect); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, id())); change->setPropertyName("parameter"); change->setValue(QVariant::fromValue(parameter->id())); d->notifyObservers(change); @@ -143,7 +143,7 @@ void QEffect::addTechnique(QTechnique *t) t->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr e(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); + QNodePropertyChangePtr e(new QNodePropertyChange(NodeAdded, QSceneChange::Node, id())); e->setPropertyName("technique"); e->setValue(QVariant::fromValue(t->id())); d->notifyObservers(e); @@ -160,7 +160,7 @@ void QEffect::removeTechnique(QTechnique *t) { Q_D(QEffect); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr e(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); + QNodePropertyChangePtr e(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, id())); e->setPropertyName("technique"); e->setValue(QVariant::fromValue(t->id())); d->notifyObservers(e); diff --git a/src/render/materialsystem/qfilterkey.cpp b/src/render/materialsystem/qfilterkey.cpp index fb215e0b5..5f947ca3a 100644 --- a/src/render/materialsystem/qfilterkey.cpp +++ b/src/render/materialsystem/qfilterkey.cpp @@ -40,7 +40,7 @@ #include "qfilterkey.h" #include "qfilterkey_p.h" #include <private/qnode_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/qmaterial.cpp b/src/render/materialsystem/qmaterial.cpp index b9bf05fae..4f2baeeba 100644 --- a/src/render/materialsystem/qmaterial.cpp +++ b/src/render/materialsystem/qmaterial.cpp @@ -43,7 +43,7 @@ #include "qeffect.h" #include <Qt3DRender/private/renderlogging_p.h> #include "qparameter.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> /*! * \qmltype Material @@ -153,7 +153,7 @@ void QMaterial::addParameter(QParameter *parameter) parameter->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeAdded, QSceneChange::Node, id())); change->setPropertyName("parameter"); change->setValue(QVariant::fromValue(parameter->id())); d->notifyObservers(change); @@ -165,7 +165,7 @@ void QMaterial::removeParameter(QParameter *parameter) { Q_D(QMaterial); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, id())); change->setPropertyName("parameter"); change->setValue(QVariant::fromValue(parameter->id())); d->notifyObservers(change); diff --git a/src/render/materialsystem/qparameter.cpp b/src/render/materialsystem/qparameter.cpp index 4bdc90648..a0064cf69 100644 --- a/src/render/materialsystem/qparameter.cpp +++ b/src/render/materialsystem/qparameter.cpp @@ -40,7 +40,7 @@ #include "qparameter.h" #include "qparameter_p.h" #include <Qt3DRender/private/renderlogging_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/qtexture.h> QT_BEGIN_NAMESPACE @@ -133,7 +133,7 @@ void QParameter::setValue(const QVariant &dv) if (nodeValue != Q_NULLPTR && !nodeValue->parent()) nodeValue->setParent(this); - QScenePropertyChangePtr change(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeUpdated, QSceneChange::Node, id())); change->setPropertyName(d->m_name.toUtf8().data()); change->setValue(d->m_backendValue); diff --git a/src/render/materialsystem/qrenderpass.cpp b/src/render/materialsystem/qrenderpass.cpp index 9ec602135..3e97c9a8e 100644 --- a/src/render/materialsystem/qrenderpass.cpp +++ b/src/render/materialsystem/qrenderpass.cpp @@ -42,9 +42,9 @@ #include "qrenderpass_p.h" #include "qparameter.h" #include "qfilterkey.h" -#include "qscenepropertychange.h" #include "qrenderstate.h" -#include "private/qnode_p.h" +#include <Qt3DCore/qnodepropertychange.h> +#include <Qt3DCore/private/qnode_p.h> QT_BEGIN_NAMESPACE @@ -99,7 +99,7 @@ void QRenderPass::setShaderProgram(QShaderProgram *shaderProgram) if (d->m_shader != shaderProgram) { if (d->m_shader != Q_NULLPTR && d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr e(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); + QNodePropertyChangePtr e(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, id())); e->setPropertyName("shaderProgram"); e->setValue(QVariant::fromValue(d->m_shader->id())); d->notifyObservers(e); @@ -116,7 +116,7 @@ void QRenderPass::setShaderProgram(QShaderProgram *shaderProgram) shaderProgram->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr e(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); + QNodePropertyChangePtr e(new QNodePropertyChange(NodeAdded, QSceneChange::Node, id())); e->setPropertyName("shaderProgram"); e->setValue(QVariant::fromValue(shaderProgram->id())); d->notifyObservers(e); @@ -144,7 +144,7 @@ void QRenderPass::addFilterKey(QFilterKey *filterKey) filterKey->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeAdded, QSceneChange::Node, id())); change->setPropertyName("filterKeys"); change->setValue(QVariant::fromValue(filterKey->id())); d->notifyObservers(change); @@ -156,7 +156,7 @@ void QRenderPass::removeFilterKey(QFilterKey *filterKey) { Q_D(QRenderPass); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, id())); change->setPropertyName("filterKeys"); change->setValue(QVariant::fromValue(filterKey->id())); d->notifyObservers(change); @@ -189,7 +189,7 @@ void QRenderPass::addRenderState(QRenderState *state) state->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeAdded, QSceneChange::Node, id())); change->setPropertyName("renderState"); change->setValue(QVariant::fromValue(QNodePtr(QNode::clone(state)))); d->notifyObservers(change); @@ -204,7 +204,7 @@ void QRenderPass::removeRenderState(QRenderState *state) { Q_D(QRenderPass); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, id())); change->setPropertyName("renderState"); change->setValue(QVariant::fromValue(state->id())); d->notifyObservers(change); @@ -236,7 +236,7 @@ void QRenderPass::addParameter(QParameter *parameter) parameter->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeAdded, QSceneChange::Node, id())); change->setPropertyName("parameter"); change->setValue(QVariant::fromValue(parameter->id())); d->notifyObservers(change); @@ -249,7 +249,7 @@ void QRenderPass::removeParameter(QParameter *parameter) Q_D(QRenderPass); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, id())); change->setPropertyName("parameter"); change->setValue(QVariant::fromValue(parameter->id())); d->notifyObservers(change); diff --git a/src/render/materialsystem/qshaderprogram.cpp b/src/render/materialsystem/qshaderprogram.cpp index 2c44444ee..618dd45cc 100644 --- a/src/render/materialsystem/qshaderprogram.cpp +++ b/src/render/materialsystem/qshaderprogram.cpp @@ -39,7 +39,7 @@ #include "qshaderprogram.h" #include "qshaderprogram_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/private/qurlhelper_p.h> #include <QDebug> #include <QFile> diff --git a/src/render/materialsystem/qtechnique.cpp b/src/render/materialsystem/qtechnique.cpp index 68332bb62..31666baeb 100644 --- a/src/render/materialsystem/qtechnique.cpp +++ b/src/render/materialsystem/qtechnique.cpp @@ -41,7 +41,7 @@ #include "qtechnique_p.h" #include "qparameter.h" #include "qgraphicsapifilter.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <QDebug> QT_BEGIN_NAMESPACE @@ -96,7 +96,7 @@ void QTechnique::copy(const QNode *ref) void QTechniquePrivate::_q_graphicsApiFilterChanged() { if (m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, m_id)); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeUpdated, QSceneChange::Node, m_id)); change->setPropertyName("graphicsApiFilter"); QGraphicsApiFilter *clone = new QGraphicsApiFilter(); clone->copy(m_graphicsApiFilter); @@ -119,7 +119,7 @@ void QTechnique::addFilterKey(QFilterKey *criterion) criterion->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeAdded, QSceneChange::Node, id())); change->setPropertyName("filterKeys"); change->setValue(QVariant::fromValue(criterion->id())); d->notifyObservers(change); @@ -131,7 +131,7 @@ void QTechnique::removeFilterKey(QFilterKey *criterion) { Q_D(QTechnique); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, id())); change->setPropertyName("filterKeys"); change->setValue(QVariant::fromValue(criterion->id())); d->notifyObservers(change); @@ -159,7 +159,7 @@ void QTechnique::addParameter(QParameter *parameter) parameter->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeAdded, QSceneChange::Node, id())); change->setPropertyName("parameter"); change->setValue(QVariant::fromValue(parameter->id())); d->notifyObservers(change); @@ -172,7 +172,7 @@ void QTechnique::removeParameter(QParameter *parameter) Q_D(QTechnique); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, id())); change->setPropertyName("parameter"); change->setValue(QVariant::fromValue(parameter->id())); d->notifyObservers(change); @@ -199,7 +199,7 @@ void QTechnique::addRenderPass(QRenderPass *pass) pass->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr e(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); + QNodePropertyChangePtr e(new QNodePropertyChange(NodeAdded, QSceneChange::Node, id())); e->setPropertyName("pass"); e->setValue(QVariant::fromValue(pass->id())); d->notifyObservers(e); @@ -216,7 +216,7 @@ void QTechnique::removeRenderPass(QRenderPass *pass) { Q_D(QTechnique); if (d->m_changeArbiter) { - QScenePropertyChangePtr e(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); + QNodePropertyChangePtr e(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, id())); e->setPropertyName("pass"); e->setValue(QVariant::fromValue(pass->id())); d->notifyObservers(e); diff --git a/src/render/materialsystem/renderpass.cpp b/src/render/materialsystem/renderpass.cpp index 235a22756..cfc5d6164 100644 --- a/src/render/materialsystem/renderpass.cpp +++ b/src/render/materialsystem/renderpass.cpp @@ -48,7 +48,7 @@ #include <Qt3DRender/private/renderstates_p.h> #include <Qt3DRender/private/renderstateset_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -101,7 +101,7 @@ void RenderPass::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &c void RenderPass::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); switch (e->type()) { case NodeAdded: { diff --git a/src/render/materialsystem/shader.cpp b/src/render/materialsystem/shader.cpp index 17ed8b569..01629beec 100644 --- a/src/render/materialsystem/shader.cpp +++ b/src/render/materialsystem/shader.cpp @@ -49,7 +49,7 @@ #include <Qt3DRender/private/graphicscontext_p.h> #include <Qt3DRender/private/qshaderprogram_p.h> #include <Qt3DRender/private/stringtoint_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -158,7 +158,7 @@ QVector<QByteArray> Shader::shaderCode() const void Shader::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { - QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>(); + QNodePropertyChangePtr propertyChange = e.staticCast<QNodePropertyChange>(); QVariant propertyValue = propertyChange->value(); if (propertyChange->propertyName() == QByteArrayLiteral("vertexSourceCode")) { diff --git a/src/render/materialsystem/shaderdata.cpp b/src/render/materialsystem/shaderdata.cpp index 4324b57e0..37461bdac 100644 --- a/src/render/materialsystem/shaderdata.cpp +++ b/src/render/materialsystem/shaderdata.cpp @@ -42,7 +42,7 @@ #include "qshaderdata_p.h" #include <QMetaProperty> #include <QMetaObject> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <private/graphicscontext_p.h> #include <private/qbackendnode_p.h> #include <private/glbuffer_p.h> @@ -283,7 +283,7 @@ void ShaderData::readPeerProperties(QShaderData *shaderData) void ShaderData::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (!m_propertyReader.isNull()) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); QString propertyName = QString::fromLatin1(propertyChange->propertyName()); switch (e->type()) { case NodeUpdated: { diff --git a/src/render/materialsystem/technique.cpp b/src/render/materialsystem/technique.cpp index 117aa82e0..268e7343a 100644 --- a/src/render/materialsystem/technique.cpp +++ b/src/render/materialsystem/technique.cpp @@ -48,7 +48,7 @@ #include <Qt3DRender/private/qtechnique_p.h> #include <Qt3DRender/private/shader_p.h> #include <Qt3DCore/private/qchangearbiter_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <QDebug> @@ -128,7 +128,7 @@ void Technique::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &ch void Technique::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); switch (e->type()) { case NodeUpdated: { diff --git a/src/render/picking/objectpicker.cpp b/src/render/picking/objectpicker.cpp index 1ac6cb58c..cabc2f849 100644 --- a/src/render/picking/objectpicker.cpp +++ b/src/render/picking/objectpicker.cpp @@ -41,7 +41,7 @@ #include "qpickevent.h" #include <Qt3DRender/qobjectpicker.h> #include <Qt3DRender/qattribute.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/qbackendscenepropertychange.h> QT_BEGIN_NAMESPACE @@ -84,7 +84,7 @@ void ObjectPicker::updateFromPeer(Qt3DCore::QNode *peer) void ObjectPicker::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - const Qt3DCore::QScenePropertyChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QScenePropertyChange>(e); + const Qt3DCore::QNodePropertyChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QNodePropertyChange>(e); const QByteArray propertyName = propertyChange->propertyName(); if (propertyChange->type() == Qt3DCore::NodeUpdated) { diff --git a/src/render/renderstates/qdithering.cpp b/src/render/renderstates/qdithering.cpp index 022a2a8e4..316135b74 100644 --- a/src/render/renderstates/qdithering.cpp +++ b/src/render/renderstates/qdithering.cpp @@ -41,7 +41,7 @@ #include "qdithering.h" #include "qrenderstate_p.h" #include <private/qnode_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/qmultisampleantialiasing.cpp b/src/render/renderstates/qmultisampleantialiasing.cpp index 5765a14f0..63dd25834 100644 --- a/src/render/renderstates/qmultisampleantialiasing.cpp +++ b/src/render/renderstates/qmultisampleantialiasing.cpp @@ -40,7 +40,7 @@ #include "qmultisampleantialiasing.h" #include "qrenderstate_p.h" #include <private/qnode_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/qnodepthmask.cpp b/src/render/renderstates/qnodepthmask.cpp index 1c3bc54a1..985b9dc0e 100644 --- a/src/render/renderstates/qnodepthmask.cpp +++ b/src/render/renderstates/qnodepthmask.cpp @@ -41,7 +41,7 @@ #include "qnodepthmask.h" #include "qrenderstate_p.h" #include <private/qnode_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/qseamlesscubemap.cpp b/src/render/renderstates/qseamlesscubemap.cpp index d3560c890..3af947063 100644 --- a/src/render/renderstates/qseamlesscubemap.cpp +++ b/src/render/renderstates/qseamlesscubemap.cpp @@ -40,7 +40,7 @@ #include "qseamlesscubemap.h" #include "qrenderstate_p.h" #include <private/qnode_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/renderstatenode.cpp b/src/render/renderstates/renderstatenode.cpp index 7208d3260..126130b8a 100644 --- a/src/render/renderstates/renderstatenode.cpp +++ b/src/render/renderstates/renderstatenode.cpp @@ -37,7 +37,7 @@ #include "renderstatenode_p.h" #include <Qt3DRender/qrenderstate.h> #include <Qt3DRender/private/qrenderstatecreatedchange_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -82,7 +82,7 @@ void RenderStateNode::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBaseP void RenderStateNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == Qt3DCore::NodeUpdated) { - Qt3DCore::QScenePropertyChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QScenePropertyChange>(e); + Qt3DCore::QNodePropertyChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QNodePropertyChange>(e); if (m_impl->isPooledImpl()) { m_impl = m_impl->getOrCreateWithPropertyChange(propertyChange->propertyName(), propertyChange->value()); diff --git a/src/render/renderstates/renderstates.cpp b/src/render/renderstates/renderstates.cpp index d0aebf09c..5a0873bed 100644 --- a/src/render/renderstates/renderstates.cpp +++ b/src/render/renderstates/renderstates.cpp @@ -40,7 +40,7 @@ #include "renderstates_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/qrenderstate.h> #include <Qt3DRender/qcullface.h> diff --git a/src/render/texture/qabstracttexture.cpp b/src/render/texture/qabstracttexture.cpp index 832070d49..c352912fc 100644 --- a/src/render/texture/qabstracttexture.cpp +++ b/src/render/texture/qabstracttexture.cpp @@ -39,7 +39,7 @@ #include "qabstracttexture.h" #include "qabstracttexture_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/qabstracttextureimage.h> QT_BEGIN_NAMESPACE @@ -304,7 +304,7 @@ void QAbstractTexture::addTextureImage(QAbstractTextureImage *textureImage) textureImage->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeAdded, QSceneChange::Node, id())); change->setPropertyName("textureImage"); change->setValue(QVariant::fromValue(textureImage->id())); d->notifyObservers(change); @@ -319,7 +319,7 @@ void QAbstractTexture::removeTextureImage(QAbstractTextureImage *textureImage) { Q_D(QAbstractTexture); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, id())); change->setPropertyName("textureImage"); change->setValue(QVariant::fromValue(textureImage->id())); d->notifyObservers(change); @@ -407,21 +407,21 @@ void QAbstractTexture::setWrapMode(const QTextureWrapMode &wrapMode) Q_D(QAbstractTexture); if (d->m_wrapMode.x() != wrapMode.x()) { d->m_wrapMode.setX(wrapMode.x()); - QScenePropertyChangePtr e(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, id())); + QNodePropertyChangePtr e(new QNodePropertyChange(NodeUpdated, QSceneChange::Node, id())); e->setPropertyName("wrapModeX"); e->setValue(static_cast<int>(d->m_wrapMode.x())); d->notifyObservers(e); } if (d->m_wrapMode.y() != wrapMode.y()) { d->m_wrapMode.setY(wrapMode.y()); - QScenePropertyChangePtr e(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, id())); + QNodePropertyChangePtr e(new QNodePropertyChange(NodeUpdated, QSceneChange::Node, id())); e->setPropertyName("wrapModeY"); e->setValue(static_cast<int>(d->m_wrapMode.y())); d->notifyObservers(e); } if (d->m_wrapMode.z() != wrapMode.z()) { d->m_wrapMode.setZ(wrapMode.z()); - QScenePropertyChangePtr e(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, id())); + QNodePropertyChangePtr e(new QNodePropertyChange(NodeUpdated, QSceneChange::Node, id())); e->setPropertyName("wrapModeZ"); e->setValue(static_cast<int>(d->m_wrapMode.z())); d->notifyObservers(e); diff --git a/src/render/texture/qabstracttextureimage.cpp b/src/render/texture/qabstracttextureimage.cpp index 2f5c7e3c0..c6266e4cc 100644 --- a/src/render/texture/qabstracttextureimage.cpp +++ b/src/render/texture/qabstracttextureimage.cpp @@ -39,7 +39,7 @@ #include "qabstracttextureimage.h" #include "qabstracttextureimage_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -194,7 +194,7 @@ void QAbstractTextureImage::notifyDataGeneratorChanged() { Q_D(QAbstractTextureImage); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(NodeUpdated, QSceneChange::Node, id())); change->setPropertyName("dataGenerator"); change->setValue(QVariant::fromValue(dataGenerator())); d->notifyObservers(change); diff --git a/src/render/texture/qtextureimage.cpp b/src/render/texture/qtextureimage.cpp index cd3fb3a11..4e4f43cbf 100644 --- a/src/render/texture/qtextureimage.cpp +++ b/src/render/texture/qtextureimage.cpp @@ -40,7 +40,7 @@ #include "qtextureimage.h" #include "qtextureimage_p.h" #include "qabstracttextureimage_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -146,7 +146,7 @@ QTextureImageDataGeneratorPtr QTextureImage::dataGenerator() const void QTextureImage::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) { - Qt3DCore::QScenePropertyChangePtr e = qSharedPointerCast<Qt3DCore::QScenePropertyChange>(change); + Qt3DCore::QNodePropertyChangePtr e = qSharedPointerCast<Qt3DCore::QNodePropertyChange>(change); if (e->propertyName() == QByteArrayLiteral("status")) setStatus(static_cast<QTextureImage::Status>(e->value().toInt())); diff --git a/src/render/texture/texture.cpp b/src/render/texture/texture.cpp index 4cb2d8d8d..530c9c60e 100644 --- a/src/render/texture/texture.cpp +++ b/src/render/texture/texture.cpp @@ -46,7 +46,7 @@ #include <QOpenGLPixelTransferOptions> #include <Qt3DRender/qtexture.h> #include <Qt3DRender/qtexturedata.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/private/managers_p.h> #include <Qt3DRender/private/texturedatamanager_p.h> #include <Qt3DRender/private/qabstracttexture_p.h> @@ -552,7 +552,7 @@ void Texture::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) QMutexLocker lock(&m_lock); // We lock here so that we're sure the texture cannot be rebuilt while we are // modifying one of its properties - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); switch (e->type()) { case NodeUpdated: { if (propertyChange->propertyName() == QByteArrayLiteral("width")) { diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp index 4da877c8f..9744d0ae8 100644 --- a/src/render/texture/textureimage.cpp +++ b/src/render/texture/textureimage.cpp @@ -39,7 +39,7 @@ #include "textureimage_p.h" #include <Qt3DCore/qbackendscenepropertychange.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/private/managers_p.h> #include <Qt3DRender/private/texturedatamanager_p.h> #include <Qt3DRender/private/qabstracttextureimage_p.h> @@ -124,7 +124,7 @@ void TextureImage::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr void TextureImage::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); if (e->type() == NodeUpdated) { if (propertyChange->propertyName() == QByteArrayLiteral("layer")) { |