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/io | |
| 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/io')
| -rw-r--r-- | src/render/io/qsceneloader.cpp | 4 | ||||
| -rw-r--r-- | src/render/io/scene.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
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()); |