ChangeArbiter/SceneChange: use id as change subject

Instead of having a QNode* or QObservable as the subject of a change, we use
it's unique NodeId instead. That will prevent the ChangeArbiter from trying to
distribute changes by looking at a QNode/QObservable id when the
QNode/QObservable might have been destroyed in the meantime.

Change-Id: Ia419d5b841434fd65522c8c65de552089cfe97cf
Task-number: QTBUG-44628
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

1 files changed, 4 insertions, 14 deletions

diff --git a/src/core/qscenepropertychange.cpp b/src/core/qscenepropertychange.cpp
index 14144b157..9daac1bd0 100644
--- a/src/core/qscenepropertychange.cpp
+++ b/src/core/qscenepropertychange.cpp
@@ -67,8 +67,8 @@ void QScenePropertyChangePrivate::operator delete(void *ptr, size_t size)
     QScenePropertyChangePrivate::m_allocator->deallocateRawMemory(ptr, size);
 }
 
-QScenePropertyChange::QScenePropertyChange(ChangeFlag type, QObservableInterface *subject, QSceneChange::Priority priority)
-    : QSceneChange(*new QScenePropertyChangePrivate(this), type, subject, priority)
+QScenePropertyChange::QScenePropertyChange(ChangeFlag type, ObservableType observableType, const QNodeId &subjectId, QSceneChange::Priority priority)
+    : QSceneChange(*new QScenePropertyChangePrivate(this), type, observableType, subjectId, priority)
 {
 }
 
@@ -77,8 +77,8 @@ QScenePropertyChange::QScenePropertyChange(QScenePropertyChangePrivate &dd)
 {
 }
 
-QScenePropertyChange::QScenePropertyChange(ChangeFlag type, QNode *node, QSceneChange::Priority priority)
-    : QSceneChange(*new QScenePropertyChangePrivate(this), type, node, priority)
+QScenePropertyChange::QScenePropertyChange(QScenePropertyChangePrivate &dd, ChangeFlag type, ObservableType observableType, const QNodeId &subjectId, QSceneChange::Priority priority)
+    : QSceneChange(dd, type, observableType, subjectId, priority)
 {
 }
 
@@ -86,16 +86,6 @@ QScenePropertyChange::~QScenePropertyChange()
 {
 }
 
-QScenePropertyChange::QScenePropertyChange(QScenePropertyChangePrivate &dd, ChangeFlag type, QObservableInterface *subject, QSceneChange::Priority priority)
-    : QSceneChange(dd, type, subject, priority)
-{
-}
-
-QScenePropertyChange::QScenePropertyChange(QScenePropertyChangePrivate &dd, ChangeFlag type, QNode *node, QSceneChange::Priority priority)
-    : QSceneChange(dd, type, node, priority)
-{
-}
-
 const char *QScenePropertyChange::propertyName() const
 {
     Q_D(const QScenePropertyChange);