diff options
154 files changed, 517 insertions, 511 deletions
diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp index fe04b322b..5d83eaa19 100644 --- a/src/core/aspects/qabstractaspect.cpp +++ b/src/core/aspects/qabstractaspect.cpp @@ -45,7 +45,7 @@ #include <private/qchangearbiter_p.h> #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/private/qnodevisitor_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/private/corelogging_p.h> QT_BEGIN_NAMESPACE @@ -144,7 +144,7 @@ void QAbstractAspect::registerBackendType(const QMetaObject &obj, const QBackend void QAbstractAspectPrivate::sceneNodeAdded(QSceneChangePtr &change) { if (m_useCloning) { - QScenePropertyChangePtr propertyChange = change.staticCast<QScenePropertyChange>(); + QNodePropertyChangePtr propertyChange = change.staticCast<QNodePropertyChange>(); QNodePtr nodePtr = propertyChange->value().value<QNodePtr>(); QNode *n = nodePtr.data(); QNodeVisitor visitor; @@ -158,7 +158,7 @@ void QAbstractAspectPrivate::sceneNodeAdded(QSceneChangePtr &change) void QAbstractAspectPrivate::sceneNodeRemoved(QSceneChangePtr &change) { if (m_useCloning) { - QScenePropertyChangePtr propertyChange = change.staticCast<QScenePropertyChange>(); + QNodePropertyChangePtr propertyChange = change.staticCast<QNodePropertyChange>(); QNodePtr nodePtr = propertyChange->value().value<QNodePtr>(); QNode *n = nodePtr.data(); clearBackendNode(n); diff --git a/src/core/core.pri b/src/core/core.pri index eff20581e..0cbb5a19f 100644 --- a/src/core/core.pri +++ b/src/core/core.pri @@ -19,9 +19,7 @@ HEADERS += \ $$PWD/qscheduler_p.h \ $$PWD/corelogging_p.h \ $$PWD/qscenechange.h \ - $$PWD/qscenepropertychange.h \ $$PWD/qscenechange_p.h \ - $$PWD/qscenepropertychange_p.h \ $$PWD/qsceneobserverinterface_p.h \ $$PWD/qpostman_p.h \ $$PWD/qbackendscenepropertychange.h \ @@ -41,7 +39,9 @@ HEADERS += \ $$PWD/qcomponentremovedchange.h \ $$PWD/qcomponentremovedchange_p.h \ $$PWD/qnodepropertychangebase.h \ - $$PWD/qnodepropertychangebase_p.h + $$PWD/qnodepropertychangebase_p.h \ + $$PWD/qnodepropertychange_p.h \ + $$PWD/qnodepropertychange.h SOURCES += \ $$PWD/qtickclock.cpp \ @@ -52,7 +52,6 @@ SOURCES += \ $$PWD/qobserverinterface.cpp \ $$PWD/qlockableobserverinterface.cpp \ $$PWD/qscenechange.cpp \ - $$PWD/qscenepropertychange.cpp \ $$PWD/qsceneobserverinterface.cpp \ $$PWD/qpostman.cpp \ $$PWD/qscene.cpp \ @@ -62,4 +61,5 @@ SOURCES += \ $$PWD/qnodedestroyedchange.cpp \ $$PWD/qcomponentaddedchange.cpp \ $$PWD/qcomponentremovedchange.cpp \ - $$PWD/qnodepropertychangebase.cpp + $$PWD/qnodepropertychangebase.cpp \ + $$PWD/qnodepropertychange.cpp diff --git a/src/core/nodes/qbackendnode.cpp b/src/core/nodes/qbackendnode.cpp index 178c59328..a812734b1 100644 --- a/src/core/nodes/qbackendnode.cpp +++ b/src/core/nodes/qbackendnode.cpp @@ -41,7 +41,7 @@ #include "qbackendnode_p.h" #include "qaspectengine.h" #include "qnode.h" -#include "qscenepropertychange.h" +#include "qnodepropertychange.h" #include <Qt3DCore/private/corelogging_p.h> QT_BEGIN_NAMESPACE @@ -249,7 +249,7 @@ void QBackendNode::setEnabled(bool enabled) void QBackendNode::sceneChangeEvent(const QSceneChangePtr &e) { Q_D(QBackendNode); - auto propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + auto propertyChange = qSharedPointerCast<QNodePropertyChange>(e); switch (e->type()) { case NodeUpdated: { diff --git a/src/core/nodes/qcomponent.cpp b/src/core/nodes/qcomponent.cpp index b23dd47da..cc6b357d0 100644 --- a/src/core/nodes/qcomponent.cpp +++ b/src/core/nodes/qcomponent.cpp @@ -42,7 +42,7 @@ #include "qentity.h" #include "qentity_p.h" #include "qscene_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/core/nodes/qentity.cpp b/src/core/nodes/qentity.cpp index 39828bdf6..5dd88680c 100644 --- a/src/core/nodes/qentity.cpp +++ b/src/core/nodes/qentity.cpp @@ -45,7 +45,7 @@ #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qcomponentaddedchange.h> #include <Qt3DCore/qcomponentremovedchange.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/qnodecreatedchange.h> #include <Qt3DCore/private/corelogging_p.h> #include <QMetaObject> diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp index dcad4824c..f144bb6a5 100644 --- a/src/core/nodes/qnode.cpp +++ b/src/core/nodes/qnode.cpp @@ -41,7 +41,7 @@ #include "qnode_p.h" #include <Qt3DCore/qentity.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/qaspectengine.h> #include <Qt3DCore/private/qdestructionidandtypecollector_p.h> #include <Qt3DCore/private/qnodedestroyedchange_p.h> @@ -99,7 +99,7 @@ void QNodePrivate::_q_addChild(QNode *childNode) // We notify only if we have a QChangeArbiter if (m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr e(new QScenePropertyChange(NodeCreated, QSceneChange::Node, m_id)); + QNodePropertyChangePtr e(new QNodePropertyChange(NodeCreated, QSceneChange::Node, m_id)); e->setPropertyName("node"); // We need to clone the parent of the childNode we send QNode *parentClone = QNode::clone(q_func()); @@ -149,7 +149,7 @@ void QNodePrivate::_q_removeChild(QNode *childNode) // Notify only if child isn't a clone if (m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr e(new QScenePropertyChange(NodeAboutToBeDeleted, QSceneChange::Node, m_id)); + QNodePropertyChangePtr e(new QNodePropertyChange(NodeAboutToBeDeleted, QSceneChange::Node, m_id)); e->setPropertyName("node"); // We need to clone the parent of the childNode we send // QNode *parentClone = QNode::clone(childNode->parentNode()); @@ -354,7 +354,7 @@ void QNodePrivate::notifyPropertyChange(const char *name, const QVariant &value) if (m_blockNotifications) return; - QScenePropertyChangePtr e(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, m_id)); + QNodePropertyChangePtr e(new QNodePropertyChange(NodeUpdated, QSceneChange::Node, m_id)); e->setPropertyName(name); e->setValue(value); notifyObservers(e); diff --git a/src/core/qbackendscenepropertychange.cpp b/src/core/qbackendscenepropertychange.cpp index 7af24a925..5634d94aa 100644 --- a/src/core/qbackendscenepropertychange.cpp +++ b/src/core/qbackendscenepropertychange.cpp @@ -55,7 +55,7 @@ namespace Qt3DCore { */ QBackendScenePropertyChangePrivate::QBackendScenePropertyChangePrivate() - : QScenePropertyChangePrivate() + : QNodePropertyChangePrivate() { } @@ -64,7 +64,7 @@ QBackendScenePropertyChangePrivate::~QBackendScenePropertyChangePrivate() } QBackendScenePropertyChange::QBackendScenePropertyChange(ChangeFlag type, QNodeId subjectId, QSceneChange::Priority priority) - : QScenePropertyChange(*new QBackendScenePropertyChangePrivate, type, Observable, subjectId, priority) + : QNodePropertyChange(*new QBackendScenePropertyChangePrivate, type, Observable, subjectId, priority) { } @@ -102,7 +102,7 @@ QNodeId QBackendScenePropertyChange::targetNode() const * \internal */ QBackendScenePropertyChange::QBackendScenePropertyChange(QBackendScenePropertyChangePrivate &dd) - : QScenePropertyChange(dd) + : QNodePropertyChange(dd) { } @@ -110,7 +110,7 @@ QBackendScenePropertyChange::QBackendScenePropertyChange(QBackendScenePropertyCh * \internal */ QBackendScenePropertyChange::QBackendScenePropertyChange(QBackendScenePropertyChangePrivate &dd, ChangeFlag type, QNodeId subjectId, QSceneChange::Priority priority) - : QScenePropertyChange(dd, type, Observable, subjectId, priority) + : QNodePropertyChange(dd, type, Observable, subjectId, priority) { } diff --git a/src/core/qbackendscenepropertychange.h b/src/core/qbackendscenepropertychange.h index 2b6ad71ef..49d92a556 100644 --- a/src/core/qbackendscenepropertychange.h +++ b/src/core/qbackendscenepropertychange.h @@ -40,7 +40,7 @@ #ifndef QT3DCORE_QBACKENDSCENEPROPERTYCHANGE_H #define QT3DCORE_QBACKENDSCENEPROPERTYCHANGE_H -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/qnodeid.h> QT_BEGIN_NAMESPACE @@ -50,7 +50,7 @@ namespace Qt3DCore { class QBackendScenePropertyChangePrivate; class QBackendNode; -class QT3DCORESHARED_EXPORT QBackendScenePropertyChange : public QScenePropertyChange +class QT3DCORESHARED_EXPORT QBackendScenePropertyChange : public QNodePropertyChange { public: QBackendScenePropertyChange(ChangeFlag type, QNodeId subjectId, diff --git a/src/core/qbackendscenepropertychange_p.h b/src/core/qbackendscenepropertychange_p.h index 4b382eb67..240b6550d 100644 --- a/src/core/qbackendscenepropertychange_p.h +++ b/src/core/qbackendscenepropertychange_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qscenepropertychange_p.h> +#include <private/qnodepropertychange_p.h> #include <Qt3DCore/qnodeid.h> QT_BEGIN_NAMESPACE @@ -60,7 +60,7 @@ namespace Qt3DCore { class QBackendScenePropertyChange; -class QBackendScenePropertyChangePrivate : public QScenePropertyChangePrivate +class QBackendScenePropertyChangePrivate : public QNodePropertyChangePrivate { public: QBackendScenePropertyChangePrivate(); diff --git a/src/core/qscenepropertychange.cpp b/src/core/qnodepropertychange.cpp index 8d6b1a282..d40332718 100644 --- a/src/core/qscenepropertychange.cpp +++ b/src/core/qnodepropertychange.cpp @@ -37,67 +37,73 @@ ** ****************************************************************************/ -#include "qscenepropertychange.h" -#include "qscenepropertychange_p.h" +#include "qnodepropertychange.h" +#include "qnodepropertychange_p.h" #include <Qt3DCore/private/qframeallocator_p.h> QT_BEGIN_NAMESPACE namespace Qt3DCore { -QFrameAllocator *QScenePropertyChangePrivate::m_allocator = new QFrameAllocator(128, sizeof(QScenePropertyChange), sizeof(QScenePropertyChangePrivate) * 2); -QMutex QScenePropertyChangePrivate::m_mutex; +/*! + \class Qt3DCore::QNodePropertyChange + \inmodule Qt3DCore +*/ + +QFrameAllocator *QNodePropertyChangePrivate::m_allocator = new QFrameAllocator(128, sizeof(QNodePropertyChange), sizeof(QNodePropertyChangePrivate) * 2); +QMutex QNodePropertyChangePrivate::m_mutex; -QScenePropertyChangePrivate::QScenePropertyChangePrivate() +QNodePropertyChangePrivate::QNodePropertyChangePrivate() : QNodePropertyChangeBasePrivate() { } -QScenePropertyChangePrivate::~QScenePropertyChangePrivate() +QNodePropertyChangePrivate::~QNodePropertyChangePrivate() { } -void *QScenePropertyChangePrivate::operator new(size_t size) +void *QNodePropertyChangePrivate::operator new(size_t size) { - QMutexLocker locker(&QScenePropertyChangePrivate::m_mutex); - return QScenePropertyChangePrivate::m_allocator->allocateRawMemory(size); + QMutexLocker locker(&QNodePropertyChangePrivate::m_mutex); + return QNodePropertyChangePrivate::m_allocator->allocateRawMemory(size); } -void QScenePropertyChangePrivate::operator delete(void *ptr, size_t size) +void QNodePropertyChangePrivate::operator delete(void *ptr, size_t size) { - QMutexLocker locker(&QScenePropertyChangePrivate::m_mutex); - QScenePropertyChangePrivate::m_allocator->deallocateRawMemory(ptr, size); + QMutexLocker locker(&QNodePropertyChangePrivate::m_mutex); + QNodePropertyChangePrivate::m_allocator->deallocateRawMemory(ptr, size); } + /*! - * \class Qt3DCore::QScenePropertyChange + * \class Qt3DCore::QNodePropertyChange * \inmodule Qt3DCore * * TODO */ /*! - * \typedef Qt3DCore::QScenePropertyChangePtr - * \relates Qt3DCore::QScenePropertyChange + * \typedef Qt3DCore::QNodePropertyChangePtr + * \relates Qt3DCore::QNodePropertyChange * - * A shared pointer for QScenePropertyChange. + * A shared pointer for QNodePropertyChange. */ /*! - * Constructs a new QScenePropertyChange with \a type, \a observableType, \a subjectId, and + * Constructs a new QNodePropertyChange with \a type, \a observableType, \a subjectId, and * \a priority. */ -QScenePropertyChange::QScenePropertyChange(ChangeFlag type, ObservableType observableType, - QNodeId subjectId, QSceneChange::Priority priority) - : QSceneChange(*new QScenePropertyChangePrivate, type, observableType, subjectId, priority) +QNodePropertyChange::QNodePropertyChange(ChangeFlag type, ObservableType observableType, + QNodeId subjectId, QSceneChange::Priority priority) + : QNodePropertyChangeBase(*new QNodePropertyChangePrivate, type, observableType, subjectId, priority) { } /*! * \internal */ -QScenePropertyChange::QScenePropertyChange(QScenePropertyChangePrivate &dd) +QNodePropertyChange::QNodePropertyChange(QNodePropertyChangePrivate &dd) : QNodePropertyChangeBase(dd) { } @@ -105,49 +111,49 @@ QScenePropertyChange::QScenePropertyChange(QScenePropertyChangePrivate &dd) /*! * \internal */ -QScenePropertyChange::QScenePropertyChange(QScenePropertyChangePrivate &dd, ChangeFlag type, ObservableType observableType, QNodeId subjectId, QSceneChange::Priority priority) +QNodePropertyChange::QNodePropertyChange(QNodePropertyChangePrivate &dd, ChangeFlag type, ObservableType observableType, QNodeId subjectId, QSceneChange::Priority priority) : QNodePropertyChangeBase(dd, type, observableType, subjectId, priority) { } -QScenePropertyChange::~QScenePropertyChange() +QNodePropertyChange::~QNodePropertyChange() { } /*! * \return property value. */ -QVariant QScenePropertyChange::value() const +QVariant QNodePropertyChange::value() const { - Q_D(const QScenePropertyChange); + Q_D(const QNodePropertyChange); return d->m_value; } /*! * Set the property change \a value. */ -void QScenePropertyChange::setValue(const QVariant &value) +void QNodePropertyChange::setValue(const QVariant &value) { - Q_D(QScenePropertyChange); + Q_D(QNodePropertyChange); d->m_value = value; } /*! * \return new scene property change of size \a n. */ -void *QScenePropertyChange::operator new(size_t n) +void *QNodePropertyChange::operator new(size_t n) { - QMutexLocker locker(&QScenePropertyChangePrivate::m_mutex); - return QScenePropertyChangePrivate::m_allocator->allocateRawMemory(n); + QMutexLocker locker(&QNodePropertyChangePrivate::m_mutex); + return QNodePropertyChangePrivate::m_allocator->allocateRawMemory(n); } /*! * Deletes \a size block from scene property change starting from \a ptr. */ -void QScenePropertyChange::operator delete(void *ptr, size_t size) +void QNodePropertyChange::operator delete(void *ptr, size_t size) { - QMutexLocker locker(&QScenePropertyChangePrivate::m_mutex); - QScenePropertyChangePrivate::m_allocator->deallocateRawMemory(ptr, size); + QMutexLocker locker(&QNodePropertyChangePrivate::m_mutex); + QNodePropertyChangePrivate::m_allocator->deallocateRawMemory(ptr, size); } } // Qt3D diff --git a/src/core/qscenepropertychange.h b/src/core/qnodepropertychange.h index 3a32b5aea..395081bce 100644 --- a/src/core/qscenepropertychange.h +++ b/src/core/qnodepropertychange.h @@ -46,13 +46,13 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { -class QScenePropertyChangePrivate; +class QNodePropertyChangePrivate; -class QT3DCORESHARED_EXPORT QScenePropertyChange : public QNodePropertyChangeBase +class QT3DCORESHARED_EXPORT QNodePropertyChange : public QNodePropertyChangeBase { public: - QScenePropertyChange(ChangeFlag type, ObservableType observableType, QNodeId subjectId, Priority priority = Standard); - virtual ~QScenePropertyChange(); + QNodePropertyChange(ChangeFlag type, ObservableType observableType, QNodeId subjectId, Priority priority = Standard); + virtual ~QNodePropertyChange(); QVariant value() const; void setValue(const QVariant &value); @@ -61,12 +61,12 @@ public: static void operator delete(void *ptr, size_t size); protected: - Q_DECLARE_PRIVATE(QScenePropertyChange) - QScenePropertyChange(QScenePropertyChangePrivate &dd); - QScenePropertyChange(QScenePropertyChangePrivate &dd, ChangeFlag type, ObservableType observableType, QNodeId subjectId, Priority priority = Standard); + Q_DECLARE_PRIVATE(QNodePropertyChange) + QNodePropertyChange(QNodePropertyChangePrivate &dd); + QNodePropertyChange(QNodePropertyChangePrivate &dd, ChangeFlag type, ObservableType observableType, QNodeId subjectId, Priority priority = Standard); }; -typedef QSharedPointer<QScenePropertyChange> QScenePropertyChangePtr; +typedef QSharedPointer<QNodePropertyChange> QNodePropertyChangePtr; } // namespace Qt3DCore diff --git a/src/core/qscenepropertychange_p.h b/src/core/qnodepropertychange_p.h index aaefda673..cb138e5fc 100644 --- a/src/core/qscenepropertychange_p.h +++ b/src/core/qnodepropertychange_p.h @@ -59,19 +59,19 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { -class QScenePropertyChange; +class QNodePropertyChange; class QFrameAllocator; -class QScenePropertyChangePrivate : public QNodePropertyChangeBasePrivate +class QNodePropertyChangePrivate : public QNodePropertyChangeBasePrivate { public: - QScenePropertyChangePrivate(); - virtual ~QScenePropertyChangePrivate(); + QNodePropertyChangePrivate(); + virtual ~QNodePropertyChangePrivate(); static void *operator new(size_t size); static void operator delete(void *ptr, size_t size); - Q_DECLARE_PUBLIC(QScenePropertyChange) + Q_DECLARE_PUBLIC(QNodePropertyChange) QVariant m_value; diff --git a/src/core/qnodepropertychangebase_p.h b/src/core/qnodepropertychangebase_p.h index 5b487f1a0..9dba47960 100644 --- a/src/core/qnodepropertychangebase_p.h +++ b/src/core/qnodepropertychangebase_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { -class QScenePropertyChange; +class QNodePropertyChange; class QFrameAllocator; class QNodePropertyChangeBasePrivate : public QSceneChangePrivate diff --git a/src/core/qpostman.cpp b/src/core/qpostman.cpp index 24e1e9f4f..dfab5b99e 100644 --- a/src/core/qpostman.cpp +++ b/src/core/qpostman.cpp @@ -39,7 +39,7 @@ #include "qpostman_p.h" #include <private/qobject_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/qbackendscenepropertychange.h> #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/private/qlockableobserverinterface_p.h> diff --git a/src/core/transforms/qtransform.cpp b/src/core/transforms/qtransform.cpp index e03108397..4b5ea1977 100644 --- a/src/core/transforms/qtransform.cpp +++ b/src/core/transforms/qtransform.cpp @@ -41,7 +41,7 @@ #include "qtransform_p.h" #include "qmath3d_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/action.cpp b/src/input/backend/action.cpp index 470c618db..1507d5467 100644 --- a/src/input/backend/action.cpp +++ b/src/input/backend/action.cpp @@ -41,7 +41,7 @@ #include <Qt3DInput/qaction.h> #include <Qt3DInput/qabstractactioninput.h> #include <Qt3DInput/private/qaction_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/qbackendscenepropertychange.h> QT_BEGIN_NAMESPACE @@ -93,7 +93,7 @@ void Action::setActionTriggered(bool actionTriggered) void Action::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - Qt3DCore::QScenePropertyChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QScenePropertyChange>(e); + Qt3DCore::QNodePropertyChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QNodePropertyChange>(e); if (e->type() == Qt3DCore::NodeAdded) { if (propertyChange->propertyName() == QByteArrayLiteral("input")) m_inputs.push_back(propertyChange->value().value<Qt3DCore::QNodeId>()); diff --git a/src/input/backend/actioninput.cpp b/src/input/backend/actioninput.cpp index 193bec951..306c1ea25 100644 --- a/src/input/backend/actioninput.cpp +++ b/src/input/backend/actioninput.cpp @@ -41,7 +41,7 @@ #include <Qt3DInput/qactioninput.h> #include <Qt3DInput/qabstractphysicaldevice.h> #include <Qt3DInput/private/qactioninput_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -94,7 +94,7 @@ void ActionInput::cleanup() void ActionInput::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("sourceDevice")) { m_sourceDevice = propertyChange->value().value<Qt3DCore::QNodeId>(); } else if (propertyChange->propertyName() == QByteArrayLiteral("buttons")) { diff --git a/src/input/backend/axis.cpp b/src/input/backend/axis.cpp index 2d1d6751b..61bfc9e22 100644 --- a/src/input/backend/axis.cpp +++ b/src/input/backend/axis.cpp @@ -41,7 +41,7 @@ #include <Qt3DInput/qaxis.h> #include <Qt3DInput/qaxisinput.h> #include <Qt3DInput/private/qaxis_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/qbackendscenepropertychange.h> QT_BEGIN_NAMESPACE @@ -93,7 +93,7 @@ void Axis::setAxisValue(float axisValue) void Axis::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - Qt3DCore::QScenePropertyChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QScenePropertyChange>(e); + Qt3DCore::QNodePropertyChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QNodePropertyChange>(e); if (e->type() == Qt3DCore::NodeAdded) { if (propertyChange->propertyName() == QByteArrayLiteral("input")) m_inputs.push_back(propertyChange->value().value<Qt3DCore::QNodeId>()); diff --git a/src/input/backend/axisinput.cpp b/src/input/backend/axisinput.cpp index d9c013847..11033e4e4 100644 --- a/src/input/backend/axisinput.cpp +++ b/src/input/backend/axisinput.cpp @@ -41,7 +41,7 @@ #include <Qt3DInput/qaxisinput.h> #include <Qt3DInput/qabstractphysicaldevice.h> #include <Qt3DInput/private/qaxisinput_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -104,7 +104,7 @@ void AxisInput::cleanup() void AxisInput::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("sourceDevice")) { m_sourceDevice = propertyChange->value().value<Qt3DCore::QNodeId>(); } else if (propertyChange->propertyName() == QByteArrayLiteral("scale")) { diff --git a/src/input/backend/axissetting.cpp b/src/input/backend/axissetting.cpp index e0a44f140..bcd10a478 100644 --- a/src/input/backend/axissetting.cpp +++ b/src/input/backend/axissetting.cpp @@ -40,7 +40,7 @@ #include "axissetting_p.h" #include <Qt3DInput/qaxissetting.h> #include <Qt3DInput/private/qaxissetting_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -97,7 +97,7 @@ void AxisSetting::cleanup() void AxisSetting::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("deadZoneRadius")) { m_deadZoneRadius = propertyChange->value().toFloat(); } else if (propertyChange->propertyName() == QByteArrayLiteral("axes")) { diff --git a/src/input/backend/genericdevicebackendnode.cpp b/src/input/backend/genericdevicebackendnode.cpp index eb1590419..0fa830ad8 100644 --- a/src/input/backend/genericdevicebackendnode.cpp +++ b/src/input/backend/genericdevicebackendnode.cpp @@ -41,7 +41,7 @@ #include "inputhandler_p.h" #include "inputmanagers_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DInput/qabstractphysicaldevice.h> QT_BEGIN_NAMESPACE @@ -61,7 +61,7 @@ GenericDeviceBackendNode::~GenericDeviceBackendNode() void GenericDeviceBackendNode::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("axisEvent")) { QPair<int, qreal> val = propertyChange->value().value<QPair<int, qreal>>(); diff --git a/src/input/backend/inputchord.cpp b/src/input/backend/inputchord.cpp index de991b9b7..f71fbbca3 100644 --- a/src/input/backend/inputchord.cpp +++ b/src/input/backend/inputchord.cpp @@ -40,7 +40,7 @@ #include "inputchord_p.h" #include <Qt3DInput/qinputchord.h> #include <Qt3DInput/private/qinputchord_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -108,7 +108,7 @@ void InputChord::setStartTime(qint64 time) void InputChord::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("timeout")) { m_timeout = propertyChange->value().toInt(); diff --git a/src/input/backend/inputsequence.cpp b/src/input/backend/inputsequence.cpp index 4e16dd95b..d51630240 100644 --- a/src/input/backend/inputsequence.cpp +++ b/src/input/backend/inputsequence.cpp @@ -41,7 +41,7 @@ #include <Qt3DInput/qinputsequence.h> #include <Qt3DInput/qabstractphysicaldevice.h> #include <Qt3DInput/private/qinputsequence_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <QDateTime> QT_BEGIN_NAMESPACE @@ -129,7 +129,7 @@ bool InputSequence::actionTriggered(Qt3DCore::QNodeId input, const qint64 curren void InputSequence::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("timeout")) { m_timeout = propertyChange->value().toInt(); diff --git a/src/input/backend/inputsettings.cpp b/src/input/backend/inputsettings.cpp index f8142154e..32858b916 100644 --- a/src/input/backend/inputsettings.cpp +++ b/src/input/backend/inputsettings.cpp @@ -41,7 +41,7 @@ #include <Qt3DInput/qinputsettings.h> #include <Qt3DInput/private/inputhandler_p.h> #include <Qt3DInput/private/qinputsettings_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -72,7 +72,7 @@ void InputSettings::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr void InputSettings::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("eventSource")) m_eventSource = propertyChange->value().value<QObject *>(); } diff --git a/src/input/backend/keyboardhandler.cpp b/src/input/backend/keyboardhandler.cpp index 504ee3d0f..650f79bbc 100644 --- a/src/input/backend/keyboardhandler.cpp +++ b/src/input/backend/keyboardhandler.cpp @@ -43,7 +43,7 @@ #include "qkeyboarddevice.h" #include "inputhandler_p.h" #include "inputmanagers_p.h" -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/qbackendscenepropertychange.h> #include <QVariant> @@ -117,7 +117,7 @@ void KeyboardHandler::sceneChangeEvent(const QSceneChangePtr &e) { bool focusRequest = false; if (e->type() == NodeUpdated) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("device")) { const QNodeId newId = propertyChange->value().value<QNodeId>(); if (m_keyboardDevice != newId) { diff --git a/src/input/backend/logicaldevice.cpp b/src/input/backend/logicaldevice.cpp index 0b730a0f8..bf43c19d9 100644 --- a/src/input/backend/logicaldevice.cpp +++ b/src/input/backend/logicaldevice.cpp @@ -43,7 +43,7 @@ #include <Qt3DInput/qaction.h> #include <Qt3DInput/private/inputmanagers_p.h> #include <Qt3DInput/private/qlogicaldevice_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -82,7 +82,7 @@ void LogicalDevice::cleanup() void LogicalDevice::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - Qt3DCore::QScenePropertyChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QScenePropertyChange>(e); + Qt3DCore::QNodePropertyChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QNodePropertyChange>(e); if (e->type() == Qt3DCore::NodeAdded) { if (propertyChange->propertyName() == QByteArrayLiteral("axis")) m_axes.push_back(propertyChange->value().value<Qt3DCore::QNodeId>()); diff --git a/src/input/backend/mousedevice.cpp b/src/input/backend/mousedevice.cpp index 7d623a2a4..e8ef31e0c 100644 --- a/src/input/backend/mousedevice.cpp +++ b/src/input/backend/mousedevice.cpp @@ -44,7 +44,7 @@ #include <Qt3DCore/qnode.h> #include <Qt3DCore/qentity.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -137,7 +137,7 @@ void MouseDevice::updateMouseEvents(const QList<QT_PREPEND_NAMESPACE(QMouseEvent void MouseDevice::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("sensitivity")) m_sensitivity = propertyChange->value().toFloat(); } diff --git a/src/input/backend/mousehandler.cpp b/src/input/backend/mousehandler.cpp index ad8c56133..9381acf1c 100644 --- a/src/input/backend/mousehandler.cpp +++ b/src/input/backend/mousehandler.cpp @@ -45,7 +45,7 @@ #include <Qt3DInput/qmousehandler.h> #include <Qt3DInput/private/qmousehandler_p.h> #include <Qt3DInput/qmousedevice.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/qbackendscenepropertychange.h> QT_BEGIN_NAMESPACE @@ -110,7 +110,7 @@ void MouseHandler::wheelEvent(const QWheelEventPtr &event) void MouseHandler::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { - QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("device")) { const QNodeId newId = propertyChange->value().value<QNodeId>(); if (m_mouseDevice != newId) { diff --git a/src/input/backend/qabstractphysicaldevicebackendnode.cpp b/src/input/backend/qabstractphysicaldevicebackendnode.cpp index 5923253b3..4965214a4 100644 --- a/src/input/backend/qabstractphysicaldevicebackendnode.cpp +++ b/src/input/backend/qabstractphysicaldevicebackendnode.cpp @@ -48,7 +48,7 @@ #include <Qt3DInput/qphysicaldevicecreatedchange.h> #include <Qt3DInput/private/qinputaspect_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/private/qabstractaspect_p.h> #include <cmath> @@ -182,7 +182,7 @@ void QAbstractPhysicalDeviceBackendNode::cleanup() void QAbstractPhysicalDeviceBackendNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { Q_D(QAbstractPhysicalDeviceBackendNode); - Qt3DCore::QScenePropertyChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QScenePropertyChange>(e); + Qt3DCore::QNodePropertyChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QNodePropertyChange>(e); if (e->type() == Qt3DCore::NodeAdded) { if (propertyChange->propertyName() == QByteArrayLiteral("axisSettings")) { const Qt3DCore::QNodeId axisSettingId = propertyChange->value().value<Qt3DCore::QNodeId>(); diff --git a/src/input/frontend/qabstractphysicaldevice.cpp b/src/input/frontend/qabstractphysicaldevice.cpp index 018fecc8d..af9849cce 100644 --- a/src/input/frontend/qabstractphysicaldevice.cpp +++ b/src/input/frontend/qabstractphysicaldevice.cpp @@ -40,7 +40,7 @@ #include "qabstractphysicaldevice.h" #include "qabstractphysicaldevice_p.h" #include <Qt3DInput/qphysicaldevicecreatedchange.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/private/qnode_p.h> QT_BEGIN_NAMESPACE @@ -189,7 +189,7 @@ QVector<QAxisSetting *> QAbstractPhysicalDevice::axisSettings() const void QAbstractPhysicalDevicePrivate::postAxisEvent(int axis, qreal value) { Q_Q(QAbstractPhysicalDevice); - Qt3DCore::QScenePropertyChangePtr change(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, q->id())); + Qt3DCore::QNodePropertyChangePtr change(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, q->id())); change->setPropertyName("axisEvent"); change->setValue(QVariant::fromValue(QPair<int, qreal>(axis, value))); notifyObservers(change); @@ -201,7 +201,7 @@ void QAbstractPhysicalDevicePrivate::postAxisEvent(int axis, qreal value) void QAbstractPhysicalDevicePrivate::postButtonEvent(int button, qreal value) { Q_Q(QAbstractPhysicalDevice); - Qt3DCore::QScenePropertyChangePtr change(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, q->id())); + Qt3DCore::QNodePropertyChangePtr change(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, q->id())); change->setPropertyName("buttonEvent"); change->setValue(QVariant::fromValue(QPair<int, qreal>(button, value))); notifyObservers(change); diff --git a/src/input/frontend/qaction.cpp b/src/input/frontend/qaction.cpp index 654c7ba05..79a72fcf5 100644 --- a/src/input/frontend/qaction.cpp +++ b/src/input/frontend/qaction.cpp @@ -40,7 +40,7 @@ #include "qaction.h" #include "qaction_p.h" #include <Qt3DCore/private/qnode_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/qnodecreatedchange.h> #include <Qt3DInput/qabstractactioninput.h> @@ -127,7 +127,7 @@ void QAction::addInput(QAbstractActionInput *input) input->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - Qt3DCore::QScenePropertyChangePtr change(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, id())); + Qt3DCore::QNodePropertyChangePtr change(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, id())); change->setPropertyName("input"); change->setValue(QVariant::fromValue(input->id())); d->notifyObservers(change); @@ -144,7 +144,7 @@ void QAction::removeInput(QAbstractActionInput *input) if (d->m_inputs.contains(input)) { if (d->m_changeArbiter != Q_NULLPTR) { - Qt3DCore::QScenePropertyChangePtr change(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, id())); + Qt3DCore::QNodePropertyChangePtr change(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, id())); change->setPropertyName("input"); change->setValue(QVariant::fromValue(input->id())); d->notifyObservers(change); @@ -174,7 +174,7 @@ void QAction::copy(const Qt3DCore::QNode *ref) void QAction::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) { Q_D(QAction); - Qt3DCore::QScenePropertyChangePtr e = qSharedPointerCast<Qt3DCore::QScenePropertyChange>(change); + Qt3DCore::QNodePropertyChangePtr e = qSharedPointerCast<Qt3DCore::QNodePropertyChange>(change); if (e->type() == Qt3DCore::NodeUpdated && e->propertyName() == QByteArrayLiteral("active")) { d->setActive(e->value().toBool()); } diff --git a/src/input/frontend/qaxis.cpp b/src/input/frontend/qaxis.cpp index e800085a1..137119017 100644 --- a/src/input/frontend/qaxis.cpp +++ b/src/input/frontend/qaxis.cpp @@ -39,7 +39,7 @@ #include "qaxis.h" #include "qaxis_p.h" #include <Qt3DInput/qaxisinput.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/qnodecreatedchange.h> QT_BEGIN_NAMESPACE @@ -82,7 +82,7 @@ void QAxis::addInput(QAxisInput *input) input->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - Qt3DCore::QScenePropertyChangePtr change(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, id())); + Qt3DCore::QNodePropertyChangePtr change(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, id())); change->setPropertyName("input"); change->setValue(QVariant::fromValue(input->id())); d->notifyObservers(change); @@ -96,7 +96,7 @@ void QAxis::removeInput(QAxisInput *input) if (d->m_inputs.contains(input)) { if (d->m_changeArbiter != Q_NULLPTR) { - Qt3DCore::QScenePropertyChangePtr change(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, id())); + Qt3DCore::QNodePropertyChangePtr change(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, id())); change->setPropertyName("input"); change->setValue(QVariant::fromValue(input->id())); d->notifyObservers(change); @@ -130,7 +130,7 @@ void QAxis::copy(const Qt3DCore::QNode *ref) void QAxis::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) { Q_D(QAxis); - Qt3DCore::QScenePropertyChangePtr e = qSharedPointerCast<Qt3DCore::QScenePropertyChange>(change); + Qt3DCore::QNodePropertyChangePtr e = qSharedPointerCast<Qt3DCore::QNodePropertyChange>(change); if (e->type() == Qt3DCore::NodeUpdated && e->propertyName() == QByteArrayLiteral("value")) { d->setValue(e->value().toFloat()); } diff --git a/src/input/frontend/qinputchord.cpp b/src/input/frontend/qinputchord.cpp index fd4f326f9..716806800 100644 --- a/src/input/frontend/qinputchord.cpp +++ b/src/input/frontend/qinputchord.cpp @@ -40,7 +40,7 @@ #include "qinputchord_p.h" #include <Qt3DCore/qnodecreatedchange.h> #include <Qt3DInput/qabstractphysicaldevice.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -157,7 +157,7 @@ void QInputChord::addChord(QAbstractActionInput *input) input->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - Qt3DCore::QScenePropertyChangePtr change(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, id())); + Qt3DCore::QNodePropertyChangePtr change(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, id())); change->setPropertyName("chord"); change->setValue(QVariant::fromValue(input->id())); d->notifyObservers(change); @@ -176,7 +176,7 @@ void QInputChord::removeChord(QAbstractActionInput *input) if (d->m_chords.contains(input)) { if (d->m_changeArbiter != Q_NULLPTR) { - Qt3DCore::QScenePropertyChangePtr change(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, id())); + Qt3DCore::QNodePropertyChangePtr change(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, id())); change->setPropertyName("chord"); change->setValue(QVariant::fromValue(input->id())); d->notifyObservers(change); diff --git a/src/input/frontend/qinputsequence.cpp b/src/input/frontend/qinputsequence.cpp index 54eb74b00..0fcc6c263 100644 --- a/src/input/frontend/qinputsequence.cpp +++ b/src/input/frontend/qinputsequence.cpp @@ -42,7 +42,7 @@ #include <Qt3DCore/qnodecreatedchange.h> #include <Qt3DInput/qabstractphysicaldevice.h> #include <Qt3DInput/qabstractactioninput.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -203,7 +203,7 @@ void QInputSequence::addSequence(QAbstractActionInput *input) input->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - Qt3DCore::QScenePropertyChangePtr change(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, id())); + Qt3DCore::QNodePropertyChangePtr change(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, id())); change->setPropertyName("sequence"); change->setValue(QVariant::fromValue(input->id())); d->notifyObservers(change); @@ -222,7 +222,7 @@ void QInputSequence::removeSequence(QAbstractActionInput *input) if (d->m_sequences.contains(input)) { if (d->m_changeArbiter != Q_NULLPTR) { - Qt3DCore::QScenePropertyChangePtr change(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, id())); + Qt3DCore::QNodePropertyChangePtr change(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, id())); change->setPropertyName("sequence"); change->setValue(QVariant::fromValue(input->id())); d->notifyObservers(change); diff --git a/src/input/frontend/qlogicaldevice.cpp b/src/input/frontend/qlogicaldevice.cpp index debbefbf4..4606b1cbe 100644 --- a/src/input/frontend/qlogicaldevice.cpp +++ b/src/input/frontend/qlogicaldevice.cpp @@ -41,7 +41,7 @@ #include "qlogicaldevice_p.h" #include <Qt3DInput/qaction.h> #include <Qt3DInput/qaxis.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/qnodecreatedchange.h> QT_BEGIN_NAMESPACE @@ -165,7 +165,7 @@ void QLogicalDevice::addAction(QAction *action) action->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - Qt3DCore::QScenePropertyChangePtr change(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, id())); + Qt3DCore::QNodePropertyChangePtr change(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, id())); change->setPropertyName("action"); change->setValue(QVariant::fromValue(action->id())); d->notifyObservers(change); @@ -182,7 +182,7 @@ void QLogicalDevice::removeAction(QAction *action) if (d->m_actions.contains(action)) { if (d->m_changeArbiter != Q_NULLPTR) { - Qt3DCore::QScenePropertyChangePtr change(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, id())); + Qt3DCore::QNodePropertyChangePtr change(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, id())); change->setPropertyName("action"); change->setValue(QVariant::fromValue(action->id())); d->notifyObservers(change); @@ -221,7 +221,7 @@ void QLogicalDevice::addAxis(QAxis *axis) axis->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - Qt3DCore::QScenePropertyChangePtr change(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, id())); + Qt3DCore::QNodePropertyChangePtr change(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, id())); change->setPropertyName("axis"); change->setValue(QVariant::fromValue(axis->id())); d->notifyObservers(change); @@ -237,7 +237,7 @@ void QLogicalDevice::removeAxis(QAxis *axis) Q_D(QLogicalDevice); if (d->m_axes.contains(axis)) { if (d->m_changeArbiter != Q_NULLPTR) { - Qt3DCore::QScenePropertyChangePtr change(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, id())); + Qt3DCore::QNodePropertyChangePtr change(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, id())); change->setPropertyName("axis"); change->setValue(QVariant::fromValue(axis->id())); d->notifyObservers(change); 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")) { diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp index 5eb76827d..973db6c0e 100644 --- a/tests/auto/core/nodes/tst_nodes.cpp +++ b/tests/auto/core/nodes/tst_nodes.cpp @@ -31,7 +31,7 @@ #include <Qt3DCore/qentity.h> #include <Qt3DCore/qcomponent.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/qcomponentaddedchange.h> #include <Qt3DCore/qcomponentremovedchange.h> #include <Qt3DCore/private/qnodedestroyedchange_p.h> @@ -374,7 +374,7 @@ void tst_Nodes::appendSingleChildNodeToNodeSceneExplicitParenting() QVERIFY(spy.events.first().wasLocked()); QCOMPARE(node->children().count(), 1); - Qt3DCore::QScenePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(event->type(), Qt3DCore::NodeCreated); QCOMPARE(event->propertyName(), "node"); Qt3DCore::QNodePtr clone = event->value().value<Qt3DCore::QNodePtr>(); @@ -406,7 +406,7 @@ void tst_Nodes::appendSingleChildNodeToNodeSceneImplicitParenting() QVERIFY(spy.events.first().wasLocked()); QCOMPARE(node->children().count(), 1); - Qt3DCore::QScenePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(event->type(), Qt3DCore::NodeCreated); QCOMPARE(event->propertyName(), "node"); Qt3DCore::QNodePtr clone = event->value().value<Qt3DCore::QNodePtr>(); @@ -450,7 +450,7 @@ void tst_Nodes::appendMultipleChildNodesToNodeScene() Q_FOREACH (const ObserverSpy::ChangeRecord &r, spy.events) { QVERIFY(r.wasLocked()); - Qt3DCore::QScenePropertyChangePtr event = r.change().dynamicCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr event = r.change().dynamicCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(event->type(), Qt3DCore::NodeCreated); QCOMPARE(event->propertyName(), "node"); Qt3DCore::QNodePtr clone = event->value().value<Qt3DCore::QNodePtr>(); @@ -493,7 +493,7 @@ void tst_Nodes::checkParentChangeToNull() QCOMPARE(spy.events.size(), 1); QVERIFY(spy.events.first().wasLocked()); - Qt3DCore::QScenePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(event->type(), Qt3DCore::NodeAboutToBeDeleted); QCOMPARE(event->propertyName(), "node"); Qt3DCore::QNodePtr clone = event->value().value<Qt3DCore::QNodePtr>(); @@ -540,7 +540,7 @@ void tst_Nodes::checkParentChangeToOtherParent() // CHECK event 1 is a Node Deleted event QVERIFY(spyParent1.events.first().wasLocked()); - Qt3DCore::QScenePropertyChangePtr event = spyParent1.events.takeFirst().change().dynamicCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr event = spyParent1.events.takeFirst().change().dynamicCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(event->type(), Qt3DCore::NodeAboutToBeDeleted); QCOMPARE(event->propertyName(), "node"); Qt3DCore::QNodePtr clone = event->value().value<Qt3DCore::QNodePtr>(); @@ -549,7 +549,7 @@ void tst_Nodes::checkParentChangeToOtherParent() // CHECK event 2 is a Node Added event QVERIFY(spyParent2.events.last().wasLocked()); - event = spyParent2.events.last().change().dynamicCast<Qt3DCore::QScenePropertyChange>(); + event = spyParent2.events.last().change().dynamicCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(event->type(), Qt3DCore::NodeCreated); QCOMPARE(event->propertyName(), "node"); clone = event->value().value<Qt3DCore::QNodePtr>(); @@ -581,7 +581,7 @@ void tst_Nodes::removingSingleChildNodeFromNode() QCOMPARE(spy.events.size(), 1); QVERIFY(spy.events.first().wasLocked()); - Qt3DCore::QScenePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(event->type(), Qt3DCore::NodeAboutToBeDeleted); QCOMPARE(event->propertyName(), "node"); Qt3DCore::QNodePtr clone = event->value().value<Qt3DCore::QNodePtr>(); @@ -621,7 +621,7 @@ void tst_Nodes::removingMultipleChildNodesFromNode() QCOMPARE(spy.events.size(), 10); Q_FOREACH (const ObserverSpy::ChangeRecord &r, spy.events) { QVERIFY(r.wasLocked()); - Qt3DCore::QScenePropertyChangePtr event = r.change().dynamicCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr event = r.change().dynamicCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(event->type(), Qt3DCore::NodeAboutToBeDeleted); QCOMPARE(event->propertyName(), "node"); Qt3DCore::QNodePtr clone = event->value().value<Qt3DCore::QNodePtr>(); @@ -776,7 +776,7 @@ void tst_Nodes::changeCustomProperty() // THEN QCOMPARE(spy.events.size(), 1); QVERIFY(spy.events.first().wasLocked()); - Qt3DCore::QScenePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(event->type(), Qt3DCore::NodeUpdated); QCOMPARE(event->propertyName(), "customProperty"); QCOMPARE(event->value().toString(), QString("foo")); diff --git a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp index 950349d5d..95f1206c9 100644 --- a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp +++ b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp @@ -31,7 +31,7 @@ #include <Qt3DCore/private/qobservableinterface_p.h> #include <Qt3DCore/private/qchangearbiter_p.h> #include <Qt3DCore/private/qpostman_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/qscenechange.h> #include <Qt3DCore/qbackendscenepropertychange.h> #include <Qt3DCore/private/qscene_p.h> @@ -64,42 +64,42 @@ public: void sendNodeAddedNotification() { - Qt3DCore::QScenePropertyChangePtr e(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, id())); + Qt3DCore::QNodePropertyChangePtr e(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, id())); e->setPropertyName("NodeAdded"); Qt3DCore::QNodePrivate::get(this)->notifyObservers(e); } void sendNodeRemovedNotification() { - Qt3DCore::QScenePropertyChangePtr e(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, id())); + Qt3DCore::QNodePropertyChangePtr e(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, id())); e->setPropertyName("NodeRemoved"); Qt3DCore::QNodePrivate::get(this)->notifyObservers(e); } void sendNodeUpdatedNotification() { - Qt3DCore::QScenePropertyChangePtr e(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, id())); + Qt3DCore::QNodePropertyChangePtr e(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, id())); e->setPropertyName("NodeUpdated"); Qt3DCore::QNodePrivate::get(this)->notifyObservers(e); } void sendComponentAddedNotification() { - Qt3DCore::QScenePropertyChangePtr e(new Qt3DCore::QScenePropertyChange(Qt3DCore::ComponentAdded, Qt3DCore::QSceneChange::Node, id())); + Qt3DCore::QNodePropertyChangePtr e(new Qt3DCore::QNodePropertyChange(Qt3DCore::ComponentAdded, Qt3DCore::QSceneChange::Node, id())); e->setPropertyName("ComponentAdded"); Qt3DCore::QNodePrivate::get(this)->notifyObservers(e); } void sendComponentRemovedNotification() { - Qt3DCore::QScenePropertyChangePtr e(new Qt3DCore::QScenePropertyChange(Qt3DCore::ComponentRemoved, Qt3DCore::QSceneChange::Node, id())); + Qt3DCore::QNodePropertyChangePtr e(new Qt3DCore::QNodePropertyChange(Qt3DCore::ComponentRemoved, Qt3DCore::QSceneChange::Node, id())); e->setPropertyName("ComponentRemoved"); Qt3DCore::QNodePrivate::get(this)->notifyObservers(e); } void sendAllChangesNotification() { - Qt3DCore::QScenePropertyChangePtr e(new Qt3DCore::QScenePropertyChange(Qt3DCore::AllChanges, Qt3DCore::QSceneChange::Node, id())); + Qt3DCore::QNodePropertyChangePtr e(new Qt3DCore::QNodePropertyChange(Qt3DCore::AllChanges, Qt3DCore::QSceneChange::Node, id())); e->setPropertyName("AllChanges"); Qt3DCore::QNodePrivate::get(this)->notifyObservers(e); } diff --git a/tests/auto/core/qtransform/tst_qtransform.cpp b/tests/auto/core/qtransform/tst_qtransform.cpp index f2dd8fcc8..bcf260cab 100644 --- a/tests/auto/core/qtransform/tst_qtransform.cpp +++ b/tests/auto/core/qtransform/tst_qtransform.cpp @@ -104,9 +104,9 @@ private Q_SLOTS: QCoreApplication::processEvents(); // THEN - Qt3DCore::QScenePropertyChangePtr change; + Qt3DCore::QNodePropertyChangePtr change; QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "translation"); QCOMPARE(change->value().value<QVector3D>(), QVector3D(454.0f, 427.0f, 383.0f)); @@ -119,7 +119,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "rotation"); QCOMPARE(change->value().value<QQuaternion>(), q); @@ -131,7 +131,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "scale3D"); QCOMPARE(change->value().value<QVector3D>(), QVector3D(883.0f, 1200.0f, 1340.0f)); @@ -146,13 +146,13 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 3); - change = arbiter.events.takeFirst().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.takeFirst().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "scale3D"); QCOMPARE(change->value().value<QVector3D>(), QVector3D(1.0f, 1.0f, 1.0f)); - change = arbiter.events.takeFirst().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.takeFirst().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "rotation"); QCOMPARE(change->value().value<QQuaternion>(), QQuaternion()); - change = arbiter.events.takeFirst().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.takeFirst().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "translation"); QCOMPARE(change->value().value<QVector3D>(), QVector3D()); @@ -164,7 +164,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "rotation"); QCOMPARE(change->value().value<QQuaternion>().toEulerAngles().x(), 20.0f); diff --git a/tests/auto/input/action/tst_action.cpp b/tests/auto/input/action/tst_action.cpp index c1612519b..83189a3fa 100644 --- a/tests/auto/input/action/tst_action.cpp +++ b/tests/auto/input/action/tst_action.cpp @@ -29,7 +29,7 @@ #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DInput/private/action_p.h> #include <Qt3DInput/QActionInput> #include <Qt3DInput/QAction> @@ -99,10 +99,10 @@ private Q_SLOTS: { // GIVEN Qt3DInput::Input::Action backendAction; - Qt3DCore::QScenePropertyChangePtr updateChange; + Qt3DCore::QNodePropertyChangePtr updateChange; // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("enabled"); updateChange->setValue(true); backendAction.sceneChangeEvent(updateChange); @@ -112,7 +112,7 @@ private Q_SLOTS: // WHEN Qt3DCore::QNodeId inputId = Qt3DCore::QNodeId::createId(); - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("input"); updateChange->setValue(QVariant::fromValue(inputId)); backendAction.sceneChangeEvent(updateChange); @@ -122,7 +122,7 @@ private Q_SLOTS: QCOMPARE(backendAction.inputs().first(), inputId); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("input"); updateChange->setValue(QVariant::fromValue(inputId)); backendAction.sceneChangeEvent(updateChange); @@ -145,7 +145,7 @@ private Q_SLOTS: // THEN QVERIFY(currentActionTriggeredValue != backendAction.actionTriggered()); QCOMPARE(arbiter.events.count(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "active"); QCOMPARE(change->value().toBool(), backendAction.actionTriggered()); diff --git a/tests/auto/input/axis/tst_axis.cpp b/tests/auto/input/axis/tst_axis.cpp index eb4b5789e..95db24798 100644 --- a/tests/auto/input/axis/tst_axis.cpp +++ b/tests/auto/input/axis/tst_axis.cpp @@ -29,7 +29,7 @@ #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DInput/private/axis_p.h> #include <Qt3DInput/QAxisInput> #include <Qt3DInput/QAxis> @@ -99,10 +99,10 @@ private Q_SLOTS: { // GIVEN Qt3DInput::Input::Axis backendAxis; - Qt3DCore::QScenePropertyChangePtr updateChange; + Qt3DCore::QNodePropertyChangePtr updateChange; // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("enabled"); updateChange->setValue(true); backendAxis.sceneChangeEvent(updateChange); @@ -112,7 +112,7 @@ private Q_SLOTS: // WHEN Qt3DCore::QNodeId inputId = Qt3DCore::QNodeId::createId(); - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("input"); updateChange->setValue(QVariant::fromValue(inputId)); backendAxis.sceneChangeEvent(updateChange); @@ -122,7 +122,7 @@ private Q_SLOTS: QCOMPARE(backendAxis.inputs().first(), inputId); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("input"); updateChange->setValue(QVariant::fromValue(inputId)); backendAxis.sceneChangeEvent(updateChange); @@ -144,7 +144,7 @@ private Q_SLOTS: // THEN QCOMPARE(backendAxis.axisValue(), 454.0f); QCOMPARE(arbiter.events.count(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "value"); QCOMPARE(change->value().toFloat(), backendAxis.axisValue()); diff --git a/tests/auto/input/axisinput/tst_axisinput.cpp b/tests/auto/input/axisinput/tst_axisinput.cpp index a0025dade..56ed840fe 100644 --- a/tests/auto/input/axisinput/tst_axisinput.cpp +++ b/tests/auto/input/axisinput/tst_axisinput.cpp @@ -29,10 +29,10 @@ #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DInput/private/axisinput_p.h> #include <Qt3DInput/QAxisInput> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include "testdevice.h" namespace { @@ -118,7 +118,7 @@ private Q_SLOTS: Qt3DInput::Input::AxisInput backendAxisInput; // WHEN - Qt3DCore::QScenePropertyChangePtr updateChange(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(32); updateChange->setPropertyName("axis"); backendAxisInput.sceneChangeEvent(updateChange); @@ -127,7 +127,7 @@ private Q_SLOTS: QCOMPARE(backendAxisInput.axis(), 32); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(QVariantList() << QVariant(64)); updateChange->setPropertyName("buttons"); backendAxisInput.sceneChangeEvent(updateChange); @@ -136,7 +136,7 @@ private Q_SLOTS: compareKeys(backendAxisInput.buttons(), QVariantList() << QVariant(64)); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(0.5f); updateChange->setPropertyName("scale"); backendAxisInput.sceneChangeEvent(updateChange); @@ -145,7 +145,7 @@ private Q_SLOTS: QCOMPARE(backendAxisInput.scale(), 0.5f); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("enabled"); updateChange->setValue(true); backendAxisInput.sceneChangeEvent(updateChange); @@ -155,7 +155,7 @@ private Q_SLOTS: // WHEN TestDevice device; - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("sourceDevice"); updateChange->setValue(QVariant::fromValue(device.id())); backendAxisInput.sceneChangeEvent(updateChange); diff --git a/tests/auto/input/qaction/tst_qaction.cpp b/tests/auto/input/qaction/tst_qaction.cpp index adf8a0c46..16b961d83 100644 --- a/tests/auto/input/qaction/tst_qaction.cpp +++ b/tests/auto/input/qaction/tst_qaction.cpp @@ -107,7 +107,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "input"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), input->id()); QCOMPARE(change->type(), Qt3DCore::NodeAdded); @@ -120,7 +120,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "input"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), input->id()); QCOMPARE(change->type(), Qt3DCore::NodeRemoved); @@ -135,7 +135,7 @@ private Q_SLOTS: // Note: simulate backend change to frontend // WHEN - Qt3DCore::QScenePropertyChangePtr valueChange(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr valueChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); valueChange->setPropertyName("active"); valueChange->setValue(true); sceneChangeEvent(valueChange); diff --git a/tests/auto/input/qactioninput/tst_qactioninput.cpp b/tests/auto/input/qactioninput/tst_qactioninput.cpp index 0ece3055e..6a56e731c 100644 --- a/tests/auto/input/qactioninput/tst_qactioninput.cpp +++ b/tests/auto/input/qactioninput/tst_qactioninput.cpp @@ -104,7 +104,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "buttons"); QCOMPARE(change->value().toList(), buttons); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -118,7 +118,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "sourceDevice"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), device->id()); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); diff --git a/tests/auto/input/qaxis/tst_qaxis.cpp b/tests/auto/input/qaxis/tst_qaxis.cpp index 883237361..af018e214 100644 --- a/tests/auto/input/qaxis/tst_qaxis.cpp +++ b/tests/auto/input/qaxis/tst_qaxis.cpp @@ -107,7 +107,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "input"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), input->id()); QCOMPARE(change->type(), Qt3DCore::NodeAdded); @@ -120,7 +120,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "input"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), input->id()); QCOMPARE(change->type(), Qt3DCore::NodeRemoved); @@ -135,7 +135,7 @@ private Q_SLOTS: // Note: simulate backend change to frontend // WHEN - Qt3DCore::QScenePropertyChangePtr valueChange(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr valueChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); valueChange->setPropertyName("value"); valueChange->setValue(383.0f); sceneChangeEvent(valueChange); diff --git a/tests/auto/input/qaxisinput/tst_qaxisinput.cpp b/tests/auto/input/qaxisinput/tst_qaxisinput.cpp index dfda083fd..489337da9 100644 --- a/tests/auto/input/qaxisinput/tst_qaxisinput.cpp +++ b/tests/auto/input/qaxisinput/tst_qaxisinput.cpp @@ -110,7 +110,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "buttons"); QCOMPARE(change->value().toList(), buttons); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -123,7 +123,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "scale"); QCOMPARE(change->value().toFloat(), 1340.0f); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -136,7 +136,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "axis"); QCOMPARE(change->value().toInt(), 350); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -150,7 +150,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "sourceDevice"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), device->id()); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); diff --git a/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp b/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp index 25f95b474..de1031da2 100644 --- a/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp +++ b/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp @@ -114,7 +114,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "action"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), action->id()); QCOMPARE(change->type(), Qt3DCore::NodeAdded); @@ -127,7 +127,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "action"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), action->id()); QCOMPARE(change->type(), Qt3DCore::NodeRemoved); @@ -141,7 +141,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "axis"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), axis->id()); QCOMPARE(change->type(), Qt3DCore::NodeAdded); @@ -154,7 +154,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "axis"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), axis->id()); QCOMPARE(change->type(), Qt3DCore::NodeRemoved); diff --git a/tests/auto/render/attribute/tst_attribute.cpp b/tests/auto/render/attribute/tst_attribute.cpp index c2e186113..f13fe8bc5 100644 --- a/tests/auto/render/attribute/tst_attribute.cpp +++ b/tests/auto/render/attribute/tst_attribute.cpp @@ -29,7 +29,7 @@ #include <QtTest/QTest> #include <Qt3DRender/private/attribute_p.h> #include <Qt3DRender/qbuffer.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include "testrenderer.h" class tst_Attribute : public QObject @@ -137,7 +137,7 @@ private Q_SLOTS: QVERIFY(!renderAttribute.isDirty()); // WHEN - Qt3DCore::QScenePropertyChangePtr updateChange(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(static_cast<int>(Qt3DRender::QAttribute::Int)); updateChange->setPropertyName("vertexBaseType"); renderAttribute.sceneChangeEvent(updateChange); @@ -153,7 +153,7 @@ private Q_SLOTS: QVERIFY(!renderer.dirtyBits()); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(3); updateChange->setPropertyName("vertexSize"); renderAttribute.sceneChangeEvent(updateChange); @@ -168,7 +168,7 @@ private Q_SLOTS: QVERIFY(!renderAttribute.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(static_cast<int>(Qt3DRender::QAttribute::IndexAttribute)); updateChange->setPropertyName("attributeType"); renderAttribute.sceneChangeEvent(updateChange); @@ -183,7 +183,7 @@ private Q_SLOTS: QVERIFY(!renderAttribute.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(1340); updateChange->setPropertyName("count"); renderAttribute.sceneChangeEvent(updateChange); @@ -198,7 +198,7 @@ private Q_SLOTS: QVERIFY(!renderAttribute.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(QStringLiteral("L88")); updateChange->setPropertyName("name"); renderAttribute.sceneChangeEvent(updateChange); @@ -213,7 +213,7 @@ private Q_SLOTS: QVERIFY(!renderAttribute.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(555); updateChange->setPropertyName("byteOffset"); renderAttribute.sceneChangeEvent(updateChange); @@ -228,7 +228,7 @@ private Q_SLOTS: QVERIFY(!renderAttribute.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(454); updateChange->setPropertyName("byteStride"); renderAttribute.sceneChangeEvent(updateChange); @@ -243,7 +243,7 @@ private Q_SLOTS: QVERIFY(!renderAttribute.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(1450); updateChange->setPropertyName("divisor"); renderAttribute.sceneChangeEvent(updateChange); @@ -258,7 +258,7 @@ private Q_SLOTS: QVERIFY(!renderAttribute.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); Qt3DCore::QNodeId bufferId = Qt3DCore::QNodeId::createId(); updateChange->setValue(QVariant::fromValue(bufferId)); updateChange->setPropertyName("buffer"); diff --git a/tests/auto/render/boundingvolumedebug/tst_boundingvolumedebug.cpp b/tests/auto/render/boundingvolumedebug/tst_boundingvolumedebug.cpp index 6cbea93d6..3b67420f3 100644 --- a/tests/auto/render/boundingvolumedebug/tst_boundingvolumedebug.cpp +++ b/tests/auto/render/boundingvolumedebug/tst_boundingvolumedebug.cpp @@ -30,7 +30,7 @@ #include <Qt3DRender/private/boundingvolumedebug_p.h> #include <Qt3DRender/private/qboundingvolumedebug_p.h> #include <Qt3DCore/private/qbackendnode_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include "testpostmanarbiter.h" #include "testrenderer.h" @@ -91,7 +91,7 @@ private Q_SLOTS: QVERIFY(!boundingVolumeDebug.isRecursive()); // WHEN - Qt3DCore::QScenePropertyChangePtr updateChange(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(true); updateChange->setPropertyName("recursive"); boundingVolumeDebug.sceneChangeEvent(updateChange); @@ -113,7 +113,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.count(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "radius"); QCOMPARE(change->value().toFloat(), 1340.0f); @@ -131,7 +131,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.count(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "center"); QCOMPARE(change->value().value<QVector3D>(), QVector3D(1.0f, 2.0f, 3.0f)); diff --git a/tests/auto/render/buffer/tst_buffer.cpp b/tests/auto/render/buffer/tst_buffer.cpp index ee04d26c0..f91d56587 100644 --- a/tests/auto/render/buffer/tst_buffer.cpp +++ b/tests/auto/render/buffer/tst_buffer.cpp @@ -28,7 +28,7 @@ #include <QtTest/QTest> #include <Qt3DRender/private/buffer_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/private/qbackendnode_p.h> #include "testpostmanarbiter.h" #include "testrenderer.h" @@ -131,7 +131,7 @@ private Q_SLOTS: QVERIFY(!renderBuffer.isDirty()); // WHEN - Qt3DCore::QScenePropertyChangePtr updateChange(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(static_cast<int>(Qt3DRender::QBuffer::IndexBuffer)); updateChange->setPropertyName("type"); renderBuffer.sceneChangeEvent(updateChange); @@ -145,7 +145,7 @@ private Q_SLOTS: QVERIFY(!renderBuffer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(static_cast<int>(Qt3DRender::QBuffer::DynamicRead)); updateChange->setPropertyName("usage"); renderBuffer.sceneChangeEvent(updateChange); @@ -158,7 +158,7 @@ private Q_SLOTS: QVERIFY(!renderBuffer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(QByteArrayLiteral("LS9")); updateChange->setPropertyName("data"); renderBuffer.sceneChangeEvent(updateChange); @@ -174,7 +174,7 @@ private Q_SLOTS: // WHEN Qt3DRender::QBufferDataGeneratorPtr functor(new TestFunctor(355)); - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(QVariant::fromValue(functor)); updateChange->setPropertyName("dataGenerator"); renderBuffer.sceneChangeEvent(updateChange); @@ -187,7 +187,7 @@ private Q_SLOTS: QVERIFY(!renderBuffer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(true); updateChange->setPropertyName("syncData"); renderBuffer.sceneChangeEvent(updateChange); @@ -203,7 +203,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.count(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "data"); QCOMPARE(change->value().toByteArray(), QByteArrayLiteral("454")); diff --git a/tests/auto/render/commons/testpostmanarbiter.h b/tests/auto/render/commons/testpostmanarbiter.h index 65d9aaa14..61931b122 100644 --- a/tests/auto/render/commons/testpostmanarbiter.h +++ b/tests/auto/render/commons/testpostmanarbiter.h @@ -28,7 +28,7 @@ #include <Qt3DCore/private/qpostman_p.h> #include <Qt3DCore/private/qchangearbiter_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/tests/auto/render/entity/tst_entity.cpp b/tests/auto/render/entity/tst_entity.cpp index 8e553194e..37ed5e7c3 100644 --- a/tests/auto/render/entity/tst_entity.cpp +++ b/tests/auto/render/entity/tst_entity.cpp @@ -30,7 +30,7 @@ #include <Qt3DRender/private/entity_p.h> #include <Qt3DRender/QCameraLens> -#include <Qt3DCore/QScenePropertyChange> +#include <Qt3DCore/QNodePropertyChange> #include <Qt3DCore/QComponentAddedChange> #include <Qt3DCore/QTransform> @@ -190,7 +190,7 @@ private slots: // WHEN renderer.resetDirty(); - QScenePropertyChangePtr removeChange(new QScenePropertyChange(ComponentRemoved, QSceneChange::Node, component->id())); + QNodePropertyChangePtr removeChange(new QNodePropertyChange(ComponentRemoved, QSceneChange::Node, component->id())); removeChange->setPropertyName("componentId"); removeChange->setValue(QVariant::fromValue(component->id())); entity.sceneChangeEvent(removeChange); @@ -248,7 +248,7 @@ private slots: // WHEN renderer.resetDirty(); - QScenePropertyChangePtr removeChange(new QScenePropertyChange(ComponentRemoved, QSceneChange::Node, components.first()->id())); + QNodePropertyChangePtr removeChange(new QNodePropertyChange(ComponentRemoved, QSceneChange::Node, components.first()->id())); removeChange->setPropertyName("componentId"); removeChange->setValue(QVariant::fromValue(components.first()->id())); entity.sceneChangeEvent(removeChange); diff --git a/tests/auto/render/geometry/tst_geometry.cpp b/tests/auto/render/geometry/tst_geometry.cpp index 48c2f5424..c1536b6c0 100644 --- a/tests/auto/render/geometry/tst_geometry.cpp +++ b/tests/auto/render/geometry/tst_geometry.cpp @@ -30,7 +30,7 @@ #include <Qt3DRender/private/geometry_p.h> #include <Qt3DRender/qgeometry.h> #include <Qt3DRender/qattribute.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include "testrenderer.h" class tst_RenderGeometry : public QObject @@ -111,7 +111,7 @@ private Q_SLOTS: Qt3DCore::QNodeId geometryId = Qt3DCore::QNodeId::createId(); // WHEN - Qt3DCore::QScenePropertyChangePtr updateChange(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(QVariant::fromValue(geometryId)); updateChange->setPropertyName("attribute"); renderGeometry.sceneChangeEvent(updateChange); @@ -124,7 +124,7 @@ private Q_SLOTS: QVERIFY(!renderGeometry.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(QVariant::fromValue(geometryId)); updateChange->setPropertyName("attribute"); renderGeometry.sceneChangeEvent(updateChange); @@ -138,7 +138,7 @@ private Q_SLOTS: // WHEN const Qt3DCore::QNodeId boundingAttrId = Qt3DCore::QNodeId::createId(); - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(QVariant::fromValue(boundingAttrId)); updateChange->setPropertyName("boundingVolumePositionAttribute"); renderGeometry.sceneChangeEvent(updateChange); diff --git a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp index 674599ffe..907e00113 100644 --- a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp +++ b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp @@ -30,7 +30,7 @@ #include <Qt3DRender/private/geometryrenderer_p.h> #include <Qt3DRender/qgeometry.h> #include <Qt3DRender/qgeometryfactory.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include "testrenderer.h" class TestFactory : public Qt3DRender::QGeometryFactory @@ -167,7 +167,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - Qt3DCore::QScenePropertyChangePtr updateChange(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("instanceCount"); updateChange->setValue(2); renderGeometryRenderer.sceneChangeEvent(updateChange); @@ -181,7 +181,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("vertexCount"); updateChange->setValue(56); renderGeometryRenderer.sceneChangeEvent(updateChange); @@ -194,7 +194,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("indexOffset"); updateChange->setValue(65); renderGeometryRenderer.sceneChangeEvent(updateChange); @@ -207,7 +207,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("firstInstance"); updateChange->setValue(82); renderGeometryRenderer.sceneChangeEvent(updateChange); @@ -220,7 +220,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("restartIndexValue"); updateChange->setValue(46); renderGeometryRenderer.sceneChangeEvent(updateChange); @@ -233,7 +233,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("primitiveRestartEnabled"); updateChange->setValue(true); renderGeometryRenderer.sceneChangeEvent(updateChange); @@ -246,7 +246,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("primitiveType"); updateChange->setValue(static_cast<int>(Qt3DRender::QGeometryRenderer::LineLoop)); renderGeometryRenderer.sceneChangeEvent(updateChange); @@ -259,7 +259,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setPropertyName("geometryFactory"); Qt3DRender::QGeometryFactoryPtr factory(new TestFactory(1450)); updateChange->setValue(QVariant::fromValue(factory)); @@ -273,7 +273,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); Qt3DCore::QNodeId geometryId = Qt3DCore::QNodeId::createId(); updateChange->setValue(QVariant::fromValue(geometryId)); updateChange->setPropertyName("geometry"); @@ -287,7 +287,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(QVariant::fromValue(geometryId)); updateChange->setPropertyName("geometry"); renderGeometryRenderer.sceneChangeEvent(updateChange); @@ -300,7 +300,7 @@ private Q_SLOTS: QVERIFY(!renderGeometryRenderer.isDirty()); // WHEN - updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + updateChange.reset(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(QVariant::fromValue(true)); updateChange->setPropertyName("enabled"); renderGeometryRenderer.sceneChangeEvent(updateChange); diff --git a/tests/auto/render/material/tst_material.cpp b/tests/auto/render/material/tst_material.cpp index 3ec5f7cfa..c704ded28 100644 --- a/tests/auto/render/material/tst_material.cpp +++ b/tests/auto/render/material/tst_material.cpp @@ -32,7 +32,7 @@ #include <Qt3DRender/QMaterial> #include <Qt3DRender/QParameter> #include <Qt3DRender/QEffect> -#include <Qt3DCore/QScenePropertyChange> +#include <Qt3DCore/QNodePropertyChange> #include "testrenderer.h" using namespace Qt3DCore; @@ -135,7 +135,7 @@ void tst_RenderMaterial::shouldHandleParametersPropertyChange() backend.setRenderer(&renderer); // WHEN - QScenePropertyChangePtr addChange(new QScenePropertyChange(NodeAdded, QSceneChange::Node, parameter->id())); + QNodePropertyChangePtr addChange(new QNodePropertyChange(NodeAdded, QSceneChange::Node, parameter->id())); addChange->setValue(QVariant::fromValue(parameter->id())); addChange->setPropertyName("parameter"); backend.sceneChangeEvent(addChange); @@ -146,7 +146,7 @@ void tst_RenderMaterial::shouldHandleParametersPropertyChange() QVERIFY(renderer.dirtyBits() != 0); // WHEN - QScenePropertyChangePtr removeChange(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, parameter->id())); + QNodePropertyChangePtr removeChange(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, parameter->id())); removeChange->setValue(QVariant::fromValue(parameter->id())); removeChange->setPropertyName("parameter"); backend.sceneChangeEvent(removeChange); @@ -163,7 +163,7 @@ void tst_RenderMaterial::shouldHandleEnablePropertyChange() backend.setRenderer(&renderer); // WHEN - QScenePropertyChangePtr updateChange(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, QNodeId())); + QNodePropertyChangePtr updateChange(new QNodePropertyChange(NodeUpdated, QSceneChange::Node, QNodeId())); updateChange->setValue(true); updateChange->setPropertyName("enabled"); backend.sceneChangeEvent(updateChange); @@ -173,7 +173,7 @@ void tst_RenderMaterial::shouldHandleEnablePropertyChange() QVERIFY(renderer.dirtyBits() != 0); // WHEN - QScenePropertyChangePtr secondUpdateChange(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, QNodeId())); + QNodePropertyChangePtr secondUpdateChange(new QNodePropertyChange(NodeUpdated, QSceneChange::Node, QNodeId())); secondUpdateChange->setValue(false); secondUpdateChange->setPropertyName("enabled"); backend.sceneChangeEvent(secondUpdateChange); @@ -191,7 +191,7 @@ void tst_RenderMaterial::shouldHandleEffectPropertyChange() backend.setRenderer(&renderer); // WHEN - QScenePropertyChangePtr updateChange(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); Qt3DCore::QNodeId effectId = Qt3DCore::QNodeId::createId(); updateChange->setValue(QVariant::fromValue(effectId)); updateChange->setPropertyName("effect"); diff --git a/tests/auto/render/objectpicker/tst_objectpicker.cpp b/tests/auto/render/objectpicker/tst_objectpicker.cpp index dc3bc33de..ca3d42a7f 100644 --- a/tests/auto/render/objectpicker/tst_objectpicker.cpp +++ b/tests/auto/render/objectpicker/tst_objectpicker.cpp @@ -31,7 +31,7 @@ #include <Qt3DRender/qpickevent.h> #include <Qt3DRender/qobjectpicker.h> #include <Qt3DCore/private/qbackendnode_p.h> -#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DCore/qnodepropertychange.h> #include "testpostmanarbiter.h" #include "testrenderer.h" @@ -90,7 +90,7 @@ private Q_SLOTS: QVERIFY(!objectPicker.isDirty()); // WHEN - Qt3DCore::QScenePropertyChangePtr updateChange(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); + Qt3DCore::QNodePropertyChangePtr updateChange(new Qt3DCore::QNodePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId())); updateChange->setValue(true); updateChange->setPropertyName("hoverEnabled"); objectPicker.sceneChangeEvent(updateChange); @@ -118,7 +118,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.count(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "pressed"); arbiter.events.clear(); @@ -128,7 +128,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.count(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "released"); arbiter.events.clear(); @@ -138,7 +138,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.count(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "clicked"); arbiter.events.clear(); @@ -148,7 +148,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.count(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "entered"); arbiter.events.clear(); @@ -158,7 +158,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.count(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "exited"); arbiter.events.clear(); diff --git a/tests/auto/render/picking/tst_picking.cpp b/tests/auto/render/picking/tst_picking.cpp index d379966d0..8c5124af2 100644 --- a/tests/auto/render/picking/tst_picking.cpp +++ b/tests/auto/render/picking/tst_picking.cpp @@ -29,7 +29,7 @@ #include <QtTest/QtTest> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qtransform.h> -#include <Qt3DCore/QScenePropertyChange> +#include <Qt3DCore/QNodePropertyChange> #include <Qt3DRender/private/qboundingvolumeprovider_p.h> #include <Qt3DRender/private/pickboundingvolumejob_p.h> #include <Qt3DRender/private/objectpicker_p.h> diff --git a/tests/auto/render/qattribute/tst_qattribute.cpp b/tests/auto/render/qattribute/tst_qattribute.cpp index ba7371e0d..80fc6bbf9 100644 --- a/tests/auto/render/qattribute/tst_qattribute.cpp +++ b/tests/auto/render/qattribute/tst_qattribute.cpp @@ -128,7 +128,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "vertexBaseType"); QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DRender::QAttribute::Double)); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -141,7 +141,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "vertexSize"); QCOMPARE(change->value().value<uint>(), 4U); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -154,7 +154,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "name"); QCOMPARE(change->value().value<QString>(), QStringLiteral("Duntov")); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -167,7 +167,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "count"); QCOMPARE(change->value().value<uint>(), 883U); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -180,7 +180,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "byteStride"); QCOMPARE(change->value().value<uint>(), 1340U); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -193,7 +193,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "byteOffset"); QCOMPARE(change->value().value<uint>(), 1584U); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -206,7 +206,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "divisor"); QCOMPARE(change->value().value<uint>(), 1450U); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -219,7 +219,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "attributeType"); QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DRender::QAttribute::IndexAttribute)); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -233,7 +233,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "buffer"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), buf.id()); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -247,7 +247,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "buffer"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), buf2.id()); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); diff --git a/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp b/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp index a5e3e7f4c..af1c0a206 100644 --- a/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp +++ b/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp @@ -108,7 +108,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.last().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.last().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "recursive"); QCOMPARE(change->value().toBool(), true); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -128,7 +128,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.last().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.last().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "recursive"); QCOMPARE(change->value().toBool(), false); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); diff --git a/tests/auto/render/qbuffer/tst_qbuffer.cpp b/tests/auto/render/qbuffer/tst_qbuffer.cpp index f4b4f8f71..ef6865e7b 100644 --- a/tests/auto/render/qbuffer/tst_qbuffer.cpp +++ b/tests/auto/render/qbuffer/tst_qbuffer.cpp @@ -130,7 +130,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "type"); QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DRender::QBuffer::IndexBuffer)); @@ -142,7 +142,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "usage"); QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DRender::QBuffer::DynamicCopy)); @@ -154,7 +154,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "data"); QCOMPARE(change->value().value<QByteArray>(), QByteArrayLiteral("Z28")); @@ -167,7 +167,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "dataGenerator"); QCOMPARE(change->value().value<Qt3DRender::QBufferDataGeneratorPtr>(), functor); @@ -179,7 +179,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "syncData"); QCOMPARE(change->value().toBool(), true); diff --git a/tests/auto/render/qcameraselector/tst_qcameraselector.cpp b/tests/auto/render/qcameraselector/tst_qcameraselector.cpp index 7cdcc3b2d..c7ed6c34a 100644 --- a/tests/auto/render/qcameraselector/tst_qcameraselector.cpp +++ b/tests/auto/render/qcameraselector/tst_qcameraselector.cpp @@ -99,7 +99,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "camera"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), camera->id()); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -120,7 +120,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "camera"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), camera2->id()); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -132,7 +132,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "camera"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), Qt3DCore::QNodeId()); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); diff --git a/tests/auto/render/qclearbuffers/tst_qclearbuffers.cpp b/tests/auto/render/qclearbuffers/tst_qclearbuffers.cpp index e90f77204..e2762fb85 100644 --- a/tests/auto/render/qclearbuffers/tst_qclearbuffers.cpp +++ b/tests/auto/render/qclearbuffers/tst_qclearbuffers.cpp @@ -101,7 +101,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "buffers"); QCOMPARE(change->subjectId(), clearBuffer->id()); QCOMPARE(change->value().value<Qt3DRender::QClearBuffers::BufferType>(), Qt3DRender::QClearBuffers::AllBuffers); @@ -122,7 +122,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "buffers"); QCOMPARE(change->subjectId(), clearBuffer->id()); QCOMPARE(change->value().value<Qt3DRender::QClearBuffers::BufferType>(), Qt3DRender::QClearBuffers::ColorDepthBuffer); diff --git a/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp b/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp index cb25fcf9c..63fb9ac3b 100644 --- a/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp +++ b/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp @@ -120,7 +120,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "enabled"); QCOMPARE(change->subjectId(), frameGraphNode->id()); QCOMPARE(change->value().toBool(), false); @@ -141,7 +141,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "enabled"); QCOMPARE(change->subjectId(), frameGraphNode->id()); QCOMPARE(change->value().toBool(), true); diff --git a/tests/auto/render/qgeometry/tst_qgeometry.cpp b/tests/auto/render/qgeometry/tst_qgeometry.cpp index f4a638ea2..c11eb1692 100644 --- a/tests/auto/render/qgeometry/tst_qgeometry.cpp +++ b/tests/auto/render/qgeometry/tst_qgeometry.cpp @@ -120,7 +120,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "attribute"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), attr.id()); QCOMPARE(change->type(), Qt3DCore::NodeAdded); @@ -140,7 +140,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "attribute"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), attr.id()); QCOMPARE(change->type(), Qt3DCore::NodeRemoved); diff --git a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp index 1f3bb5f6d..0c3284c7f 100644 --- a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp +++ b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp @@ -156,7 +156,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "instanceCount"); QCOMPARE(change->value().value<int>(), 256); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -169,7 +169,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "vertexCount"); QCOMPARE(change->value().value<int>(), 1340); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -182,7 +182,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "indexOffset"); QCOMPARE(change->value().value<int>(), 883); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -195,7 +195,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "firstInstance"); QCOMPARE(change->value().value<int>(), 1200); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -208,7 +208,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "restartIndexValue"); QCOMPARE(change->value().value<int>(), 65535); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -221,7 +221,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "verticesPerPatch"); QCOMPARE(change->value().toInt(), 2); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -234,7 +234,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "primitiveRestartEnabled"); QCOMPARE(change->value().value<bool>(), true); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -247,7 +247,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "primitiveType"); QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DRender::QGeometryRenderer::Patches)); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -261,7 +261,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "geometryFactory"); QCOMPARE(change->value().value<Qt3DRender::QGeometryFactoryPtr>(), factory); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -275,7 +275,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "geometry"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), geom.id()); QCOMPARE(change->type(), Qt3DCore::NodeAdded); @@ -289,12 +289,12 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 2); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "geometry"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), geom.id()); QCOMPARE(change->type(), Qt3DCore::NodeRemoved); - change = arbiter.events.last().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.last().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "geometry"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), geom2.id()); QCOMPARE(change->type(), Qt3DCore::NodeAdded); diff --git a/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp b/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp index 223ec7b30..eb9400151 100644 --- a/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp +++ b/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp @@ -100,7 +100,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "layers"); QCOMPARE(change->subjectId(), layerFilter->id()); QCOMPARE(change->value().value<QStringList>(), layerNames1); @@ -122,7 +122,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "layers"); QCOMPARE(change->subjectId(), layerFilter->id()); QCOMPARE(change->value().value<QStringList>(), layerNames2); @@ -136,7 +136,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "layers"); QCOMPARE(change->subjectId(), layerFilter->id()); QCOMPARE(change->value().value<QStringList>(), QStringList()); diff --git a/tests/auto/render/qlight/tst_qlight.cpp b/tests/auto/render/qlight/tst_qlight.cpp index c93198e2c..67a0cd716 100644 --- a/tests/auto/render/qlight/tst_qlight.cpp +++ b/tests/auto/render/qlight/tst_qlight.cpp @@ -126,12 +126,12 @@ private Q_SLOTS: QCoreApplication::processEvents(); QCOMPARE(lightArbiter.events.size(), 2); - Qt3DCore::QScenePropertyChangePtr change = lightArbiter.events[0].staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = lightArbiter.events[0].staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "color"); QCOMPARE(change->subjectId(), light->id()); QCOMPARE(change->value().value<QColor>(), QColor(Qt::red)); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); - change = lightArbiter.events[1].staticCast<Qt3DCore::QScenePropertyChange>(); + change = lightArbiter.events[1].staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "intensity"); QCOMPARE(change->subjectId(), light->id()); QCOMPARE(change->value().value<float>(), 0.5f); @@ -160,22 +160,22 @@ private Q_SLOTS: QCoreApplication::processEvents(); QCOMPARE(pointLightArbiter.events.size(), 4); - Qt3DCore::QScenePropertyChangePtr change = pointLightArbiter.events[0].staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = pointLightArbiter.events[0].staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "color"); QCOMPARE(change->subjectId(), pointLight->id()); QCOMPARE(change->value().value<QColor>(), QColor(Qt::green)); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); - change = pointLightArbiter.events[1].staticCast<Qt3DCore::QScenePropertyChange>(); + change = pointLightArbiter.events[1].staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "intensity"); QCOMPARE(change->subjectId(), pointLight->id()); QCOMPARE(change->value().value<float>(), 0.5f); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); - change = pointLightArbiter.events[2].staticCast<Qt3DCore::QScenePropertyChange>(); + change = pointLightArbiter.events[2].staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "constantAttenuation"); QCOMPARE(change->subjectId(), pointLight->id()); QCOMPARE(change->value().value<float>(), 0.5f); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); - change = pointLightArbiter.events[3].staticCast<Qt3DCore::QScenePropertyChange>(); + change = pointLightArbiter.events[3].staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "quadraticAttenuation"); QCOMPARE(change->subjectId(), pointLight->id()); QCOMPARE(change->value().value<float>(), 1.0f); @@ -195,17 +195,17 @@ private Q_SLOTS: QCoreApplication::processEvents(); QCOMPARE(dirLightArbiter.events.size(), 3); - Qt3DCore::QScenePropertyChangePtr change = dirLightArbiter.events[0].staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = dirLightArbiter.events[0].staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "color"); QCOMPARE(change->subjectId(), dirLight->id()); QCOMPARE(change->value().value<QColor>(), QColor(Qt::blue)); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); - change = dirLightArbiter.events[1].staticCast<Qt3DCore::QScenePropertyChange>(); + change = dirLightArbiter.events[1].staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "intensity"); QCOMPARE(change->subjectId(), dirLight->id()); QCOMPARE(change->value().value<float>(), 0.5f); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); - change = dirLightArbiter.events[2].staticCast<Qt3DCore::QScenePropertyChange>(); + change = dirLightArbiter.events[2].staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "worldDirection"); QCOMPARE(change->subjectId(), dirLight->id()); QCOMPARE(change->value().value<QVector3D>(), QVector3D(0.5f, 0.0f, -1.0f)); @@ -226,22 +226,22 @@ private Q_SLOTS: QCoreApplication::processEvents(); QCOMPARE(spotLightArbiter.events.size(), 4); - Qt3DCore::QScenePropertyChangePtr change = spotLightArbiter.events[0].staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = spotLightArbiter.events[0].staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "color"); QCOMPARE(change->subjectId(), spotLight->id()); QCOMPARE(change->value().value<QColor>(), QColor(Qt::lightGray)); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); - change = spotLightArbiter.events[1].staticCast<Qt3DCore::QScenePropertyChange>(); + change = spotLightArbiter.events[1].staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "intensity"); QCOMPARE(change->subjectId(), spotLight->id()); QCOMPARE(change->value().value<float>(), 0.5f); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); - change = spotLightArbiter.events[2].staticCast<Qt3DCore::QScenePropertyChange>(); + change = spotLightArbiter.events[2].staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "localDirection"); QCOMPARE(change->subjectId(), spotLight->id()); QCOMPARE(change->value().value<QVector3D>(), QVector3D(0.5f, 0.0f, -1.0f)); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); - change = spotLightArbiter.events[3].staticCast<Qt3DCore::QScenePropertyChange>(); + change = spotLightArbiter.events[3].staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "cutOffAngle"); QCOMPARE(change->subjectId(), spotLight->id()); QCOMPARE(change->value().value<float>(), 0.75f); diff --git a/tests/auto/render/qmaterial/tst_qmaterial.cpp b/tests/auto/render/qmaterial/tst_qmaterial.cpp index c1459eeb4..104548b2f 100644 --- a/tests/auto/render/qmaterial/tst_qmaterial.cpp +++ b/tests/auto/render/qmaterial/tst_qmaterial.cpp @@ -245,7 +245,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "effect"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), effect.id()); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -262,7 +262,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter2.events.size(), 1); - change = arbiter2.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter2.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "effect"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), effect.id()); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -281,7 +281,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "parameter"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), param->id()); QCOMPARE(change->type(), Qt3DCore::NodeAdded); @@ -295,7 +295,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "parameter"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), param->id()); QCOMPARE(change->type(), Qt3DCore::NodeAdded); @@ -309,7 +309,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "parameter"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), param->id()); QCOMPARE(change->type(), Qt3DCore::NodeAdded); @@ -323,7 +323,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "parameter"); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), param->id()); QCOMPARE(change->type(), Qt3DCore::NodeAdded); @@ -344,7 +344,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "vertexShaderCode"); QCOMPARE(change->value().value<QByteArray>(), vertexCode); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -358,7 +358,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "fragmentShaderCode"); QCOMPARE(change->value().value<QByteArray>(), fragmentCode); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -372,7 +372,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "geometryShaderCode"); QCOMPARE(change->value().value<QByteArray>(), geometryCode); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -386,7 +386,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "computeShaderCode"); QCOMPARE(change->value().value<QByteArray>(), computeCode); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -400,7 +400,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "tessellationControlShaderCode"); QCOMPARE(change->value().value<QByteArray>(), tesselControlCode); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -414,7 +414,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "tessellationEvaluationShaderCode"); QCOMPARE(change->value().value<QByteArray>(), tesselEvalCode); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); diff --git a/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp b/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp index 033c9a4cb..c8aae5b91 100644 --- a/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp +++ b/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp @@ -112,7 +112,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.last().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.last().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "hoverEnabled"); QCOMPARE(change->value().toBool(), true); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); diff --git a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp index feda852d4..8818345e6 100644 --- a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp +++ b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp @@ -163,7 +163,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "parameter"); QCOMPARE(change->subjectId(),renderPassFilter->id()); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), param1->id()); @@ -184,7 +184,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "parameter"); QCOMPARE(change->subjectId(), renderPassFilter->id()); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), param1->id()); @@ -199,7 +199,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "match"); QCOMPARE(change->subjectId(),renderPassFilter->id()); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), filterKey1->id()); @@ -220,7 +220,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "match"); QCOMPARE(change->subjectId(), renderPassFilter->id()); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), filterKey1->id()); diff --git a/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp b/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp index e4d043840..98b112f1b 100644 --- a/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp +++ b/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp @@ -145,7 +145,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "renderState"); QCOMPARE(change->subjectId(), stateSet->id()); Qt3DCore::QNodePtr clonedState = change->value().value<Qt3DCore::QNodePtr>(); @@ -168,7 +168,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "renderState"); QCOMPARE(change->subjectId(), stateSet->id()); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), state1->id()); diff --git a/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp b/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp index 404adb8ad..ba9af19f2 100644 --- a/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp +++ b/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp @@ -120,7 +120,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "target"); QCOMPARE(change->subjectId(), renderTargetSelector->id()); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), target->id()); @@ -141,7 +141,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "target"); QCOMPARE(change->subjectId(), renderTargetSelector->id()); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), Qt3DCore::QNodeId()); @@ -157,7 +157,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "outputs"); QCOMPARE(change->subjectId(), renderTargetSelector->id()); QCOMPARE(change->value().value<QVector<Qt3DRender::QRenderTargetOutput::AttachmentPoint> >(), outputs); @@ -178,7 +178,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "outputs"); QCOMPARE(change->subjectId(), renderTargetSelector->id()); QCOMPARE(change->value().value<QVector<Qt3DRender::QRenderTargetOutput::AttachmentPoint> >(), QVector<Qt3DRender::QRenderTargetOutput::AttachmentPoint>()); diff --git a/tests/auto/render/qsortcriterion/tst_qsortcriterion.cpp b/tests/auto/render/qsortcriterion/tst_qsortcriterion.cpp index e934d2f1d..619990b97 100644 --- a/tests/auto/render/qsortcriterion/tst_qsortcriterion.cpp +++ b/tests/auto/render/qsortcriterion/tst_qsortcriterion.cpp @@ -97,7 +97,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "sort"); QCOMPARE(change->subjectId(), sortCriterion->id()); QCOMPARE(change->value().value<Qt3DRender::QSortCriterion::SortType>(), Qt3DRender::QSortCriterion::BackToFront); @@ -118,7 +118,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "sort"); QCOMPARE(change->subjectId(), sortCriterion->id()); QCOMPARE(change->value().value<Qt3DRender::QSortCriterion::SortType>(), Qt3DRender::QSortCriterion::Material); diff --git a/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp b/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp index 0ac350ed4..bed90077b 100644 --- a/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp +++ b/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp @@ -119,7 +119,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "sortCriterion"); QCOMPARE(change->subjectId(),sortPolicy->id()); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), criterion1->id()); @@ -140,7 +140,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "sortCriterion"); QCOMPARE(change->subjectId(), sortPolicy->id()); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), criterion1->id()); diff --git a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp index 75fa925ca..ca2ead21e 100644 --- a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp +++ b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp @@ -163,7 +163,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "parameter"); QCOMPARE(change->subjectId(),techniqueFilter->id()); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), param1->id()); @@ -184,7 +184,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "parameter"); QCOMPARE(change->subjectId(), techniqueFilter->id()); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), param1->id()); @@ -199,7 +199,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "require"); QCOMPARE(change->subjectId(),techniqueFilter->id()); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), filterKey1->id()); @@ -220,7 +220,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "require"); QCOMPARE(change->subjectId(), techniqueFilter->id()); QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), filterKey1->id()); diff --git a/tests/auto/render/qviewport/tst_qviewport.cpp b/tests/auto/render/qviewport/tst_qviewport.cpp index 2597bbe5f..2984cfb3e 100644 --- a/tests/auto/render/qviewport/tst_qviewport.cpp +++ b/tests/auto/render/qviewport/tst_qviewport.cpp @@ -94,7 +94,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + Qt3DCore::QNodePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "normalizedRect"); QCOMPARE(change->subjectId(), viewport->id()); QCOMPARE(change->value().value<QRectF>(), QRectF(0.5f, 0.5f, 1.0f, 1.0f)); @@ -115,7 +115,7 @@ private Q_SLOTS: // THEN QCOMPARE(arbiter.events.size(), 1); - change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); + change = arbiter.events.first().staticCast<Qt3DCore::QNodePropertyChange>(); QCOMPARE(change->propertyName(), "normalizedRect"); QCOMPARE(change->subjectId(), viewport->id()); QCOMPARE(change->value().value<QRectF>(), QRectF(0.0f, 0.0f, 1.0f, 1.0f)); diff --git a/tests/auto/render/renderpass/tst_renderpass.cpp b/tests/auto/render/renderpass/tst_renderpass.cpp index f24d272e0..ee91d7b58 100644 --- a/tests/auto/render/renderpass/tst_renderpass.cpp +++ b/tests/auto/render/renderpass/tst_renderpass.cpp @@ -29,7 +29,7 @@ #include <QtTest/QtTest> #include <Qt3DRender/private/renderpass_p.h> -#include <Qt3DCore/QScenePropertyChange> +#include <Qt3DCore/QNodePropertyChange> #include <Qt3DRender/QFilterKey> #include <Qt3DRender/QRenderPass> @@ -132,7 +132,7 @@ private slots: backend.setRenderer(&renderer); // WHEN - QScenePropertyChangePtr addChange(new QScenePropertyChange(NodeAdded, QSceneChange::Node, shader->id())); + QNodePropertyChangePtr addChange(new QNodePropertyChange(NodeAdded, QSceneChange::Node, shader->id())); addChange->setValue(QVariant::fromValue(shader->id())); addChange->setPropertyName("shaderProgram"); backend.sceneChangeEvent(addChange); @@ -142,7 +142,7 @@ private slots: QVERIFY(renderer.dirtyBits() != 0); // WHEN - QScenePropertyChangePtr removeChange(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, shader->id())); + QNodePropertyChangePtr removeChange(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, shader->id())); removeChange->setValue(QVariant::fromValue(shader->id())); removeChange->setPropertyName("shaderProgram"); backend.sceneChangeEvent(removeChange); @@ -161,7 +161,7 @@ private slots: backend.setRenderer(&renderer); // WHEN - QScenePropertyChangePtr addChange(new QScenePropertyChange(NodeAdded, QSceneChange::Node, annotation->id())); + QNodePropertyChangePtr addChange(new QNodePropertyChange(NodeAdded, QSceneChange::Node, annotation->id())); addChange->setValue(QVariant::fromValue(annotation->id())); addChange->setPropertyName("filterKeys"); backend.sceneChangeEvent(addChange); @@ -172,7 +172,7 @@ private slots: QVERIFY(renderer.dirtyBits() != 0); // WHEN - QScenePropertyChangePtr removeChange(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, annotation->id())); + QNodePropertyChangePtr removeChange(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, annotation->id())); removeChange->setValue(QVariant::fromValue(annotation->id())); removeChange->setPropertyName("filterKeys"); backend.sceneChangeEvent(removeChange); @@ -191,7 +191,7 @@ private slots: backend.setRenderer(&renderer); // WHEN - QScenePropertyChangePtr addChange(new QScenePropertyChange(NodeAdded, QSceneChange::Node, parameter->id())); + QNodePropertyChangePtr addChange(new QNodePropertyChange(NodeAdded, QSceneChange::Node, parameter->id())); addChange->setValue(QVariant::fromValue(parameter->id())); addChange->setPropertyName("parameter"); backend.sceneChangeEvent(addChange); @@ -202,7 +202,7 @@ private slots: QVERIFY(renderer.dirtyBits() != 0); // WHEN - QScenePropertyChangePtr removeChange(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, parameter->id())); + QNodePropertyChangePtr removeChange(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, parameter->id())); removeChange->setValue(QVariant::fromValue(parameter->id())); removeChange->setPropertyName("parameter"); backend.sceneChangeEvent(removeChange); @@ -224,7 +224,7 @@ private slots: backendState->setPeer(frontendState); // WHEN - QScenePropertyChangePtr addChange(new QScenePropertyChange(NodeAdded, QSceneChange::Node, frontendState->id())); + QNodePropertyChangePtr addChange(new QNodePropertyChange(NodeAdded, QSceneChange::Node, frontendState->id())); addChange->setValue(QVariant::fromValue(frontendStatePtr)); addChange->setPropertyName("renderState"); backend.sceneChangeEvent(addChange); @@ -235,7 +235,7 @@ private slots: QVERIFY(renderer.dirtyBits() != 0); // WHEN - QScenePropertyChangePtr removeChange(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, frontendState->id())); + QNodePropertyChangePtr removeChange(new QNodePropertyChange(NodeRemoved, QSceneChange::Node, frontendState->id())); removeChange->setValue(QVariant::fromValue(frontendState->id())); removeChange->setPropertyName("renderState"); backend.sceneChangeEvent(removeChange); |