QBackendScenePropertyChange cleanups

Now inherits from QNodePropertyChangeBase and sets change flag so
user's don't have to.

Change-Id: I47892d73b63627664c6fa57c8b0c7ef5c4bdd3c8
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

13 files changed, 55 insertions, 31 deletions

diff --git a/src/core/qbackendscenepropertychange.cpp b/src/core/qbackendscenepropertychange.cpp
index 5634d94aa..7cfc9a604 100644
--- a/src/core/qbackendscenepropertychange.cpp
+++ b/src/core/qbackendscenepropertychange.cpp
@@ -55,7 +55,7 @@ namespace Qt3DCore {
  */
 
 QBackendScenePropertyChangePrivate::QBackendScenePropertyChangePrivate()
-    : QNodePropertyChangePrivate()
+    : QNodePropertyChangeBasePrivate()
 {
 }
 
@@ -63,8 +63,8 @@ QBackendScenePropertyChangePrivate::~QBackendScenePropertyChangePrivate()
 {
 }
 
-QBackendScenePropertyChange::QBackendScenePropertyChange(ChangeFlag type, QNodeId subjectId, QSceneChange::Priority priority)
-    : QNodePropertyChange(*new QBackendScenePropertyChangePrivate, type, Observable, subjectId, priority)
+QBackendScenePropertyChange::QBackendScenePropertyChange(QNodeId subjectId, QSceneChange::Priority priority)
+    : QNodePropertyChangeBase(*new QBackendScenePropertyChangePrivate, NodeUpdated, Observable, subjectId, priority)
 {
 }
 
@@ -72,6 +72,24 @@ QBackendScenePropertyChange::~QBackendScenePropertyChange()
 {
 }
 
+/*!
+ * \return property value.
+ */
+QVariant QBackendScenePropertyChange::value() const
+{
+    Q_D(const QBackendScenePropertyChange);
+    return d->m_value;
+}
+
+/*!
+ * Set the property change \a value.
+ */
+void QBackendScenePropertyChange::setValue(const QVariant &value)
+{
+    Q_D(QBackendScenePropertyChange);
+    d->m_value = value;
+}
+
 // TO DO get rid off setTargetNode, use the subject instead ??
 /*!
  * Sets the target node of the backend scene property change to \a id.
@@ -102,15 +120,16 @@ QNodeId QBackendScenePropertyChange::targetNode() const
  * \internal
  */
 QBackendScenePropertyChange::QBackendScenePropertyChange(QBackendScenePropertyChangePrivate &dd)
-    : QNodePropertyChange(dd)
+    : QNodePropertyChangeBase(dd)
 {
 }
 
 /*!
  * \internal
  */
-QBackendScenePropertyChange::QBackendScenePropertyChange(QBackendScenePropertyChangePrivate &dd, ChangeFlag type, QNodeId subjectId, QSceneChange::Priority priority)
-    : QNodePropertyChange(dd, type, Observable, subjectId, priority)
+QBackendScenePropertyChange::QBackendScenePropertyChange(QBackendScenePropertyChangePrivate &dd,
+                                                         QNodeId subjectId, QSceneChange::Priority priority)
+    : QNodePropertyChangeBase(dd, NodeUpdated, Observable, subjectId, priority)
 {
 }
 
diff --git a/src/core/qbackendscenepropertychange.h b/src/core/qbackendscenepropertychange.h
index 49d92a556..634d8a7a5 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/qnodepropertychange.h>
+#include <Qt3DCore/qnodepropertychangebase.h>
 #include <Qt3DCore/qnodeid.h>
 
 QT_BEGIN_NAMESPACE
@@ -50,20 +50,23 @@ namespace Qt3DCore {
 class QBackendScenePropertyChangePrivate;
 class QBackendNode;
 
-class QT3DCORESHARED_EXPORT QBackendScenePropertyChange : public QNodePropertyChange
+class QT3DCORESHARED_EXPORT QBackendScenePropertyChange : public QNodePropertyChangeBase
 {
 public:
-    QBackendScenePropertyChange(ChangeFlag type, QNodeId subjectId,
-                                Priority priority = Standard);
+    QBackendScenePropertyChange(QNodeId subjectId, Priority priority = Standard);
     virtual ~QBackendScenePropertyChange();
 
+    QVariant value() const;
+    void setValue(const QVariant &value);
+
     void setTargetNode(QNodeId id);
     QNodeId targetNode() const;
 
 protected:
     Q_DECLARE_PRIVATE(QBackendScenePropertyChange)
     QBackendScenePropertyChange(QBackendScenePropertyChangePrivate &dd);
-    QBackendScenePropertyChange(QBackendScenePropertyChangePrivate &dd, ChangeFlag type, QNodeId subjectId, Priority priority = Standard);
+    QBackendScenePropertyChange(QBackendScenePropertyChangePrivate &dd,
+                                QNodeId subjectId, Priority priority = Standard);
 };
 
 typedef QSharedPointer<QBackendScenePropertyChange> QBackendScenePropertyChangePtr;
diff --git a/src/core/qbackendscenepropertychange_p.h b/src/core/qbackendscenepropertychange_p.h
index 240b6550d..4914d1741 100644
--- a/src/core/qbackendscenepropertychange_p.h
+++ b/src/core/qbackendscenepropertychange_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <private/qnodepropertychange_p.h>
+#include <private/qnodepropertychangebase_p.h>
 #include <Qt3DCore/qnodeid.h>
 
 QT_BEGIN_NAMESPACE
@@ -60,7 +60,7 @@ namespace Qt3DCore {
 
 class QBackendScenePropertyChange;
 
-class QBackendScenePropertyChangePrivate : public QNodePropertyChangePrivate
+class QBackendScenePropertyChangePrivate : public QNodePropertyChangeBasePrivate
 {
 public:
     QBackendScenePropertyChangePrivate();
@@ -68,6 +68,7 @@ public:
 
     Q_DECLARE_PUBLIC(QBackendScenePropertyChange)
 
+    QVariant m_value;
     QNodeId m_targetUuid;
 };
 
diff --git a/src/input/backend/action.cpp b/src/input/backend/action.cpp
index 1507d5467..cbe5a5303 100644
--- a/src/input/backend/action.cpp
+++ b/src/input/backend/action.cpp
@@ -83,7 +83,7 @@ void Action::setActionTriggered(bool actionTriggered)
         m_actionTriggered = actionTriggered;
 
         // Send change to the frontend
-        Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(Qt3DCore::NodeUpdated, peerId()));
+        Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId()));
         e->setTargetNode(peerId());
         e->setPropertyName("active");
         e->setValue(m_actionTriggered);
diff --git a/src/input/backend/axis.cpp b/src/input/backend/axis.cpp
index 61bfc9e22..e7f40b8e2 100644
--- a/src/input/backend/axis.cpp
+++ b/src/input/backend/axis.cpp
@@ -83,7 +83,7 @@ void Axis::setAxisValue(float axisValue)
         m_axisValue = axisValue;
 
         // Send a change to the frontend
-        Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(Qt3DCore::NodeUpdated, peerId()));
+        Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId()));
         e->setTargetNode(peerId());
         e->setPropertyName("value");
         e->setValue(m_axisValue);
diff --git a/src/input/backend/keyboardhandler.cpp b/src/input/backend/keyboardhandler.cpp
index 650f79bbc..8d18c9295 100644
--- a/src/input/backend/keyboardhandler.cpp
+++ b/src/input/backend/keyboardhandler.cpp
@@ -96,7 +96,7 @@ void KeyboardHandler::setFocus(bool focus)
 {
     if (focus != m_focus) {
         m_focus = focus;
-        QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(NodeUpdated, peerId()));
+        QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(peerId()));
         e->setTargetNode(peerId());
         e->setPropertyName("focus");
         e->setValue(m_focus);
@@ -106,7 +106,7 @@ void KeyboardHandler::setFocus(bool focus)
 
 void KeyboardHandler::keyEvent(const QKeyEventPtr &event)
 {
-    QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(NodeUpdated, peerId()));
+    QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(peerId()));
     e->setTargetNode(peerId());
     e->setPropertyName("event");
     e->setValue(QVariant::fromValue(event));
diff --git a/src/input/backend/mousehandler.cpp b/src/input/backend/mousehandler.cpp
index 9381acf1c..7ad14f25b 100644
--- a/src/input/backend/mousehandler.cpp
+++ b/src/input/backend/mousehandler.cpp
@@ -91,7 +91,7 @@ void MouseHandler::setInputHandler(InputHandler *handler)
 
 void MouseHandler::mouseEvent(const QMouseEventPtr &event)
 {
-    QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(NodeUpdated, peerId()));
+    QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(peerId()));
     e->setTargetNode(peerId());
     e->setPropertyName("mouse");
     e->setValue(QVariant::fromValue(event));
@@ -100,7 +100,7 @@ void MouseHandler::mouseEvent(const QMouseEventPtr &event)
 
 void MouseHandler::wheelEvent(const QWheelEventPtr &event)
 {
-    QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(NodeUpdated, peerId()));
+    QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(peerId()));
     e->setTargetNode(peerId());
     e->setPropertyName("wheel");
     e->setValue(QVariant::fromValue(event));
diff --git a/src/render/backend/boundingvolumedebug.cpp b/src/render/backend/boundingvolumedebug.cpp
index d1259fe06..a782c6b31 100644
--- a/src/render/backend/boundingvolumedebug.cpp
+++ b/src/render/backend/boundingvolumedebug.cpp
@@ -40,6 +40,7 @@
 #include "boundingvolumedebug_p.h"
 #include <Qt3DRender/private/qboundingvolumedebug_p.h>
 #include <Qt3DCore/qbackendscenepropertychange.h>
+#include <Qt3DCore/qnodepropertychange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -90,7 +91,7 @@ void BoundingVolumeDebug::setRadius(float radius)
 {
     if (m_radius != radius) {
         m_radius = radius;
-        Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(Qt3DCore::NodeUpdated, peerId()));
+        Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId()));
         e->setPropertyName("radius");
         e->setTargetNode(peerId());
         e->setValue(QVariant(radius));
@@ -102,7 +103,7 @@ void BoundingVolumeDebug::setCenter(const QVector3D &center)
 {
     if (m_center != center) {
         m_center = center;
-        Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(Qt3DCore::NodeUpdated, peerId()));
+        Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId()));
         e->setPropertyName("center");
         e->setTargetNode(peerId());
         e->setValue(QVariant::fromValue(center));
diff --git a/src/render/geometry/buffer.cpp b/src/render/geometry/buffer.cpp
index 9d9ac892c..e86b7361d 100644
--- a/src/render/geometry/buffer.cpp
+++ b/src/render/geometry/buffer.cpp
@@ -88,7 +88,7 @@ void Buffer::executeFunctor()
     m_data = (*m_functor)();
     if (m_syncData) {
         // Send data back to the frontend
-        QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(NodeUpdated, peerId()));
+        QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(peerId()));
         e->setPropertyName("data");
         e->setTargetNode(peerId());
         e->setValue(QVariant::fromValue(m_data));
diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp
index 4af82c611..8b7d08021 100644
--- a/src/render/geometry/geometryrenderer.cpp
+++ b/src/render/geometry/geometryrenderer.cpp
@@ -215,7 +215,7 @@ void GeometryRenderer::executeFunctor()
     Q_ASSERT(m_geometryFactory);
     QGeometry *geometry = (*m_geometryFactory)();
 
-    QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(NodeUpdated, peerId()));
+    QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(peerId()));
     e->setPropertyName("geometry");
     // The Frontend element has to perform the clone
     // So that the objects are created in the main thread
diff --git a/src/render/io/scene.cpp b/src/render/io/scene.cpp
index 51a17efb9..3bfdc7740 100644
--- a/src/render/io/scene.cpp
+++ b/src/render/io/scene.cpp
@@ -100,7 +100,7 @@ void Scene::setSceneSubtree(Qt3DCore::QEntity *subTree)
     subTree->moveToThread(appThread);
 
     // Send the new subtree to the frontend
-    QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(NodeUpdated, peerId()));
+    QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(peerId()));
     e->setPropertyName("scene");
     e->setValue(QVariant::fromValue(subTree));
     e->setTargetNode(peerId());
diff --git a/src/render/picking/objectpicker.cpp b/src/render/picking/objectpicker.cpp
index cabc2f849..4b3db4f9d 100644
--- a/src/render/picking/objectpicker.cpp
+++ b/src/render/picking/objectpicker.cpp
@@ -134,7 +134,7 @@ bool ObjectPicker::isDragEnabled() const
 
 void ObjectPicker::onClicked(QPickEventPtr event)
 {
-    Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(Qt3DCore::NodeUpdated, peerId()));
+    Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId()));
     e->setPropertyName("clicked");
     e->setTargetNode(peerId());
     e->setValue(QVariant::fromValue(event));
@@ -143,7 +143,7 @@ void ObjectPicker::onClicked(QPickEventPtr event)
 
 void ObjectPicker::onMoved(QPickEventPtr event)
 {
-    Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(Qt3DCore::NodeUpdated, peerId()));
+    Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId()));
     e->setPropertyName("moved");
     e->setTargetNode(peerId());
     e->setValue(QVariant::fromValue(event));
@@ -152,7 +152,7 @@ void ObjectPicker::onMoved(QPickEventPtr event)
 
 void ObjectPicker::onPressed(QPickEventPtr event)
 {
-    Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(Qt3DCore::NodeUpdated, peerId()));
+    Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId()));
     e->setPropertyName("pressed");
     e->setTargetNode(peerId());
     e->setValue(QVariant::fromValue(event));
@@ -162,7 +162,7 @@ void ObjectPicker::onPressed(QPickEventPtr event)
 
 void ObjectPicker::onReleased(QPickEventPtr event)
 {
-    Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(Qt3DCore::NodeUpdated, peerId()));
+    Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId()));
     e->setPropertyName("released");
     e->setTargetNode(peerId());
     e->setValue(QVariant::fromValue(event));
@@ -172,7 +172,7 @@ void ObjectPicker::onReleased(QPickEventPtr event)
 
 void ObjectPicker::onEntered()
 {
-    Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(Qt3DCore::NodeUpdated, peerId()));
+    Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId()));
     e->setPropertyName("entered");
     e->setTargetNode(peerId());
     notifyObservers(e);
@@ -180,7 +180,7 @@ void ObjectPicker::onEntered()
 
 void ObjectPicker::onExited()
 {
-    Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(Qt3DCore::NodeUpdated, peerId()));
+    Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId()));
     e->setPropertyName("exited");
     e->setTargetNode(peerId());
     notifyObservers(e);
diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp
index fcc3accee..445e248cb 100644
--- a/src/render/texture/textureimage.cpp
+++ b/src/render/texture/textureimage.cpp
@@ -180,7 +180,7 @@ void TextureImage::setTextureDataHandle(HTextureData handle)
 void TextureImage::setStatus(QTextureImage::Status status)
 {
     // Notify the frontend
-    QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(NodeUpdated, peerId()));
+    QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(peerId()));
     e->setPropertyName("status");
     e->setValue(status);
     e->setTargetNode(peerId());