diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-05-10 13:54:43 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-10 19:09:49 +0000 |
| commit | bd9391529798c19f3e933ac6ecf468064cfe3346 (patch) | |
| tree | d563f8ee8368b3e23609aabe3d36a4aa5a93fb05 /src/render/geometry | |
| parent | eace9e4ccce917a69d6bff5908651a22f14b7918 (diff) | |
Rename QNodeAddedPropertyChange -> QPropertyNodeAddedChange
Task-number: QTBUG-51494
Change-Id: I7f59bad66eb086e2249c580be2fd9f4bad159eb3
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/geometry')
| -rw-r--r-- | src/render/geometry/geometry.cpp | 4 | ||||
| -rw-r--r-- | src/render/geometry/geometryrenderer.cpp | 6 | ||||
| -rw-r--r-- | src/render/geometry/qgeometry.cpp | 4 | ||||
| -rw-r--r-- | src/render/geometry/qgeometryrenderer.cpp | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/render/geometry/geometry.cpp b/src/render/geometry/geometry.cpp index 595485a6c..c4283fd10 100644 --- a/src/render/geometry/geometry.cpp +++ b/src/render/geometry/geometry.cpp @@ -42,7 +42,7 @@ #include <Qt3DRender/qgeometry.h> #include <Qt3DRender/private/qgeometry_p.h> #include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qnodeaddedpropertychange.h> +#include <Qt3DCore/qpropertynodeaddedchange.h> #include <Qt3DCore/qnoderemovedpropertychange.h> QT_BEGIN_NAMESPACE @@ -83,7 +83,7 @@ void Geometry::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { case PropertyValueAdded: { - const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e); + const auto change = qSharedPointerCast<QPropertyNodeAddedChange>(e); if (change->propertyName() == QByteArrayLiteral("attribute")) { m_attributes.push_back(change->addedNodeId()); m_geometryDirty = true; diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp index 736057881..0d979e166 100644 --- a/src/render/geometry/geometryrenderer.cpp +++ b/src/render/geometry/geometryrenderer.cpp @@ -43,7 +43,7 @@ #include <Qt3DRender/private/qgeometryrenderer_p.h> #include <Qt3DCore/qbackendnodepropertychange.h> #include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qnodeaddedpropertychange.h> +#include <Qt3DCore/qpropertynodeaddedchange.h> #include <Qt3DCore/qnoderemovedpropertychange.h> #include <Qt3DCore/private/qnode_p.h> #include <QtCore/qcoreapplication.h> @@ -169,7 +169,7 @@ void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) } case PropertyValueAdded: { - const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e); + const auto change = qSharedPointerCast<QPropertyNodeAddedChange>(e); if (change->propertyName() == QByteArrayLiteral("geometry")) { m_geometryId = change->addedNodeId(); m_dirty = true; @@ -178,7 +178,7 @@ void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) } case PropertyValueRemoved: { - const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e); + const auto change = qSharedPointerCast<QPropertyNodeAddedChange>(e); if (change->propertyName() == QByteArrayLiteral("geometry")) { m_geometryId = QNodeId(); m_dirty = true; diff --git a/src/render/geometry/qgeometry.cpp b/src/render/geometry/qgeometry.cpp index 2d77afd89..a941a5250 100644 --- a/src/render/geometry/qgeometry.cpp +++ b/src/render/geometry/qgeometry.cpp @@ -42,7 +42,7 @@ #include <private/qnode_p.h> #include <Qt3DRender/qattribute.h> #include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qnodeaddedpropertychange.h> +#include <Qt3DCore/qpropertynodeaddedchange.h> #include <Qt3DCore/qnoderemovedpropertychange.h> QT_BEGIN_NAMESPACE @@ -112,7 +112,7 @@ void QGeometry::addAttribute(QAttribute *attribute) attribute->setParent(this); if (d->m_changeArbiter != nullptr) { - const auto change = QNodeAddedPropertyChangePtr::create(id(), attribute); + const auto change = QPropertyNodeAddedChangePtr::create(id(), attribute); change->setPropertyName("attribute"); d->notifyObservers(change); } diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp index 1c11f55e2..03463533f 100644 --- a/src/render/geometry/qgeometryrenderer.cpp +++ b/src/render/geometry/qgeometryrenderer.cpp @@ -42,7 +42,7 @@ #include <private/qcomponent_p.h> #include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qnodeaddedpropertychange.h> +#include <Qt3DCore/qpropertynodeaddedchange.h> #include <Qt3DCore/qnoderemovedpropertychange.h> QT_BEGIN_NAMESPACE @@ -396,7 +396,7 @@ void QGeometryRenderer::setGeometry(QGeometry *geometry) blockNotifications(blocked); if (d->m_geometry && d->m_changeArbiter) { - const auto change = QNodeAddedPropertyChangePtr::create(id(), d->m_geometry); + const auto change = QPropertyNodeAddedChangePtr::create(id(), d->m_geometry); change->setPropertyName("geometry"); d->notifyObservers(change); } |