diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-05-09 11:35:22 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-10 19:08:08 +0000 |
commit | d52cfb9662a2bf193c3827b8f43a8c7ec74e953e (patch) | |
tree | e0745409bdafcec7ef96dbc7f506ac6704eabd0a /src/render/geometry | |
parent | ccb460bf3d6ea393bc114bc571c12875a37465f2 (diff) |
Rename NodeUpdated ChangeFlag to PropertyUpdated
This more correctly reflects the semantic meaning.
Task-number: QTBUG-51494
Change-Id: I3a230e959ea007f1d19808eae73b5d95b6f06514
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/geometry')
-rw-r--r-- | src/render/geometry/attribute.cpp | 2 | ||||
-rw-r--r-- | src/render/geometry/buffer.cpp | 2 | ||||
-rw-r--r-- | src/render/geometry/geometry.cpp | 2 | ||||
-rw-r--r-- | src/render/geometry/geometryrenderer.cpp | 2 | ||||
-rw-r--r-- | src/render/geometry/qbuffer.cpp | 4 | ||||
-rw-r--r-- | src/render/geometry/qgeometryrenderer.cpp | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/render/geometry/attribute.cpp b/src/render/geometry/attribute.cpp index 7e63f6ecf..5932b2c9f 100644 --- a/src/render/geometry/attribute.cpp +++ b/src/render/geometry/attribute.cpp @@ -103,7 +103,7 @@ void Attribute::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &ch void Attribute::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { - case NodeUpdated: { + case PropertyUpdated: { QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); QByteArray propertyName = propertyChange->propertyName(); diff --git a/src/render/geometry/buffer.cpp b/src/render/geometry/buffer.cpp index a6c62aa1b..b260604d5 100644 --- a/src/render/geometry/buffer.cpp +++ b/src/render/geometry/buffer.cpp @@ -113,7 +113,7 @@ void Buffer::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &chang void Buffer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - if (e->type() == NodeUpdated) { + if (e->type() == PropertyUpdated) { QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); QByteArray propertyName = propertyChange->propertyName(); if (propertyName == QByteArrayLiteral("data")) { diff --git a/src/render/geometry/geometry.cpp b/src/render/geometry/geometry.cpp index b136c380b..381256cf6 100644 --- a/src/render/geometry/geometry.cpp +++ b/src/render/geometry/geometry.cpp @@ -100,7 +100,7 @@ void Geometry::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) break; } - case NodeUpdated: { + case PropertyUpdated: { // Note: doesn't set dirtyness as this parameter changing doesn't need a new VAO update. const auto change = qSharedPointerCast<QNodePropertyChange>(e); if (change->propertyName() == QByteArrayLiteral("boundingVolumePositionAttribute")) { diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp index da8b1aca0..bc55d2f3d 100644 --- a/src/render/geometry/geometryrenderer.cpp +++ b/src/render/geometry/geometryrenderer.cpp @@ -127,7 +127,7 @@ void GeometryRenderer::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBase void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { - case NodeUpdated: { + case PropertyUpdated: { QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); QByteArray propertyName = propertyChange->propertyName(); diff --git a/src/render/geometry/qbuffer.cpp b/src/render/geometry/qbuffer.cpp index cec9ba0eb..064e2dec6 100644 --- a/src/render/geometry/qbuffer.cpp +++ b/src/render/geometry/qbuffer.cpp @@ -159,7 +159,7 @@ QBuffer::QBuffer(QBuffer::BufferType ty, QNode *parent) void QBuffer::sceneChangeEvent(const QSceneChangePtr &change) { QNodePropertyChangePtr e = qSharedPointerCast<QNodePropertyChange>(change); - if (e->type() == NodeUpdated && e->propertyName() == QByteArrayLiteral("data")) { + if (e->type() == PropertyUpdated && e->propertyName() == QByteArrayLiteral("data")) { const bool blocked = blockNotifications(true); setData(e->value().toByteArray()); blockNotifications(blocked); @@ -229,7 +229,7 @@ void QBuffer::setDataGenerator(const QBufferDataGeneratorPtr &functor) return; d->m_functor = functor; if (d->m_changeArbiter != nullptr) { - QNodePropertyChangePtr change(new QNodePropertyChange(NodeUpdated, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(PropertyUpdated, QSceneChange::Node, id())); change->setPropertyName("dataGenerator"); change->setValue(QVariant::fromValue(d->m_functor)); d->notifyObservers(change); diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp index 87ca16f11..548409d6d 100644 --- a/src/render/geometry/qgeometryrenderer.cpp +++ b/src/render/geometry/qgeometryrenderer.cpp @@ -422,7 +422,7 @@ void QGeometryRenderer::setGeometryFactory(const QGeometryFactoryPtr &factory) return; d->m_geometryFactory = factory; if (d->m_changeArbiter != nullptr) { - QNodePropertyChangePtr change(new QNodePropertyChange(NodeUpdated, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(PropertyUpdated, QSceneChange::Node, id())); change->setPropertyName("geometryFactory"); change->setValue(QVariant::fromValue(d->m_geometryFactory)); d->notifyObservers(change); @@ -435,7 +435,7 @@ void QGeometryRenderer::setGeometryFactory(const QGeometryFactoryPtr &factory) void QGeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { auto change = qSharedPointerCast<QNodePropertyChangeBase>(e); - if (change->type() == NodeUpdated && change->propertyName() == QByteArrayLiteral("geometry")) { + if (change->type() == PropertyUpdated && change->propertyName() == QByteArrayLiteral("geometry")) { auto typedChange = qSharedPointerCast<QGeometryChange>(e); auto geometry = std::move(typedChange->data); setGeometry(geometry.release()); |