QChangeArbiter/QScene refactoring

Added nodeIfFromObservable method in QSceneInterface/QScene.
Needed when the QChangeArbiter needs to find the QNode target from an
Observable.

QChangeArbiter/QPostman is passed a QObserverInterface, makes it easier to
unit test.

QPostMan sends change to QNode::sceneChangeEvent. This method should be
overloaded by subclasses of QNode.

Change-Id: If85fcb034b3fcdace82e63149ca7684d9d888d1c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

1 files changed, 2 insertions, 8 deletions

diff --git a/src/core/qchangearbiter_p.h b/src/core/qchangearbiter_p.h
index 87c00a025..c0d357c63 100644
--- a/src/core/qchangearbiter_p.h
+++ b/src/core/qchangearbiter_p.h
@@ -55,7 +55,7 @@ class QChangeArbiter;
 class QObservableInterface;
 class QJobManagerInterface;
 class QSceneObserverInterface;
-class QPostman;
+class QObserverInterface;
 class QSceneInterface;
 
 typedef QVector<QSceneChangePtr> ChangeQueue;
@@ -83,12 +83,6 @@ public:
     QHash<QUuid, QObserverList> m_nodeObservations;
     QList<QSceneObserverInterface *> m_sceneObservers;
 
-    // Observable to QUuid,
-    QHash<QObservableInterface *, QUuid> m_observableToNodeId;
-
-
-    QHash<QUuid, QObserverList> observersForNodeId;
-
     // Each thread has a TLS ChangeQueue so we never need to lock whilst
     // receiving a QSceneChange.
     QThreadStorage<ChangeQueue *> m_tlsChangeQueue;
@@ -97,7 +91,7 @@ public:
     // be accessed from the aspect thread during the syncChanges() phase.
     QList<ChangeQueue *> m_changeQueues;
     QList<ChangeQueue *> m_lockingChangeQueues;
-    QPostman *m_postman;
+    QObserverInterface *m_postman;
     QSceneInterface *m_scene;
 };