diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-05-10 12:45:08 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-10 19:09:26 +0000 |
commit | 8cb8811e1ff4beda5c54f826eec150f3864f397b (patch) | |
tree | 5d5506c5edecf2c8a0306dd5476696094a174870 /src/render/geometry | |
parent | daa14a660276da4e2b82483d15eb0a929bef9857 (diff) |
QNodePropertyChange -> QPropertyUpdatedChange
Task-number: QTBUG-51494
Change-Id: Ic326499f80b5a91b2d19c09770de926f220cc805
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/geometry')
-rw-r--r-- | src/render/geometry/attribute.cpp | 4 | ||||
-rw-r--r-- | src/render/geometry/buffer.cpp | 4 | ||||
-rw-r--r-- | src/render/geometry/geometry.cpp | 4 | ||||
-rw-r--r-- | src/render/geometry/geometryrenderer.cpp | 4 | ||||
-rw-r--r-- | src/render/geometry/qattribute.cpp | 2 | ||||
-rw-r--r-- | src/render/geometry/qbuffer.cpp | 6 | ||||
-rw-r--r-- | src/render/geometry/qgeometry.cpp | 2 | ||||
-rw-r--r-- | src/render/geometry/qgeometryrenderer.cpp | 4 | ||||
-rw-r--r-- | src/render/geometry/qmesh.cpp | 2 |
9 files changed, 16 insertions, 16 deletions
diff --git a/src/render/geometry/attribute.cpp b/src/render/geometry/attribute.cpp index 5932b2c9f..85c69cdb7 100644 --- a/src/render/geometry/attribute.cpp +++ b/src/render/geometry/attribute.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "attribute_p.h" -#include <Qt3DCore/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/qbuffer.h> #include <Qt3DRender/private/qattribute_p.h> #include <Qt3DRender/private/stringtoint_p.h> @@ -104,7 +104,7 @@ void Attribute::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { case PropertyUpdated: { - QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); + QPropertyUpdatedChangePtr propertyChange = qSharedPointerCast<QPropertyUpdatedChange>(e); QByteArray propertyName = propertyChange->propertyName(); if (propertyName == QByteArrayLiteral("name")) { diff --git a/src/render/geometry/buffer.cpp b/src/render/geometry/buffer.cpp index b260604d5..578a7be52 100644 --- a/src/render/geometry/buffer.cpp +++ b/src/render/geometry/buffer.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "buffer_p.h" -#include <Qt3DCore/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qbackendnodepropertychange.h> #include <Qt3DRender/private/buffermanager_p.h> #include <Qt3DRender/private/qbuffer_p.h> @@ -114,7 +114,7 @@ void Buffer::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &chang void Buffer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == PropertyUpdated) { - QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); + QPropertyUpdatedChangePtr propertyChange = qSharedPointerCast<QPropertyUpdatedChange>(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 d88ffa121..595485a6c 100644 --- a/src/render/geometry/geometry.cpp +++ b/src/render/geometry/geometry.cpp @@ -41,7 +41,7 @@ #include <Qt3DRender/qattribute.h> #include <Qt3DRender/qgeometry.h> #include <Qt3DRender/private/qgeometry_p.h> -#include <Qt3DCore/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qnodeaddedpropertychange.h> #include <Qt3DCore/qnoderemovedpropertychange.h> @@ -102,7 +102,7 @@ void Geometry::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) case PropertyUpdated: { // Note: doesn't set dirtyness as this parameter changing doesn't need a new VAO update. - const auto change = qSharedPointerCast<QNodePropertyChange>(e); + const auto change = qSharedPointerCast<QPropertyUpdatedChange>(e); if (change->propertyName() == QByteArrayLiteral("boundingVolumePositionAttribute")) { m_boundingPositionAttribute = change->value().value<QNodeId>(); break; diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp index 05af44b65..736057881 100644 --- a/src/render/geometry/geometryrenderer.cpp +++ b/src/render/geometry/geometryrenderer.cpp @@ -42,7 +42,7 @@ #include <Qt3DRender/private/qboundingvolume_p.h> #include <Qt3DRender/private/qgeometryrenderer_p.h> #include <Qt3DCore/qbackendnodepropertychange.h> -#include <Qt3DCore/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qnodeaddedpropertychange.h> #include <Qt3DCore/qnoderemovedpropertychange.h> #include <Qt3DCore/private/qnode_p.h> @@ -128,7 +128,7 @@ void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { case PropertyUpdated: { - QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); + QPropertyUpdatedChangePtr propertyChange = qSharedPointerCast<QPropertyUpdatedChange>(e); QByteArray propertyName = propertyChange->propertyName(); if (propertyName == QByteArrayLiteral("instanceCount")) { diff --git a/src/render/geometry/qattribute.cpp b/src/render/geometry/qattribute.cpp index ae7883f36..14b8f0cf1 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/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qbuffer.cpp b/src/render/geometry/qbuffer.cpp index 18ed8cf2c..f18db066b 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/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE @@ -158,7 +158,7 @@ QBuffer::QBuffer(QBuffer::BufferType ty, QNode *parent) */ void QBuffer::sceneChangeEvent(const QSceneChangePtr &change) { - QNodePropertyChangePtr e = qSharedPointerCast<QNodePropertyChange>(change); + QPropertyUpdatedChangePtr e = qSharedPointerCast<QPropertyUpdatedChange>(change); if (e->type() == PropertyUpdated && e->propertyName() == QByteArrayLiteral("data")) { const bool blocked = blockNotifications(true); setData(e->value().toByteArray()); @@ -229,7 +229,7 @@ void QBuffer::setDataGenerator(const QBufferDataGeneratorPtr &functor) return; d->m_functor = functor; if (d->m_changeArbiter != nullptr) { - QNodePropertyChangePtr change(new QNodePropertyChange(id())); + QPropertyUpdatedChangePtr change(new QPropertyUpdatedChange(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 61b98c5a6..2d77afd89 100644 --- a/src/render/geometry/qgeometry.cpp +++ b/src/render/geometry/qgeometry.cpp @@ -41,7 +41,7 @@ #include "qgeometry_p.h" #include <private/qnode_p.h> #include <Qt3DRender/qattribute.h> -#include <Qt3DCore/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qnodeaddedpropertychange.h> #include <Qt3DCore/qnoderemovedpropertychange.h> diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp index e1b9f8d01..1c11f55e2 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/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qnodeaddedpropertychange.h> #include <Qt3DCore/qnoderemovedpropertychange.h> @@ -422,7 +422,7 @@ void QGeometryRenderer::setGeometryFactory(const QGeometryFactoryPtr &factory) return; d->m_geometryFactory = factory; if (d->m_changeArbiter != nullptr) { - QNodePropertyChangePtr change(new QNodePropertyChange(id())); + QPropertyUpdatedChangePtr change(new QPropertyUpdatedChange(id())); change->setPropertyName("geometryFactory"); change->setValue(QVariant::fromValue(d->m_geometryFactory)); d->notifyObservers(change); diff --git a/src/render/geometry/qmesh.cpp b/src/render/geometry/qmesh.cpp index 75483a332..21ceb8ba6 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/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/private/renderlogging_p.h> #include <Qt3DRender/private/qurlhelper_p.h> |