From be9c9c9229f4eb8b850f566a8628fade826cbcf2 Mon Sep 17 00:00:00 2001
From: Sean Harmer <sean.harmer@kdab.com>
Date: Fri, 25 Nov 2016 09:38:14 +0000
Subject: QAxisAccumulaor should be a component

So that it can be aggregated by entities to accumlate axis values which
is behavior implemented on the backend.

Change-Id: Idd7a1a2c1e3f7e73c3c83023ebad9b3e85f31a5d
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
---
 src/input/frontend/qaxisaccumulator.cpp | 6 +++---
 src/input/frontend/qaxisaccumulator.h   | 4 ++--
 src/input/frontend/qaxisaccumulator_p.h | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/input/frontend/qaxisaccumulator.cpp b/src/input/frontend/qaxisaccumulator.cpp
index d205bce16..9a14c0deb 100644
--- a/src/input/frontend/qaxisaccumulator.cpp
+++ b/src/input/frontend/qaxisaccumulator.cpp
@@ -51,7 +51,7 @@ namespace Qt3DInput {
     Constructs a new QAxisAccumulator instance with \a parent.
     \class Qt3DInput::QAxisAccumulator
     \inmodule Qt3DInput
-    \inherits Qt3DCore::QNode
+    \inherits Qt3DCore::QComponent
     \brief QAxisAccumulator processes velocity or acceleration data from a QAxis.
     \since 5.8
 
@@ -103,7 +103,7 @@ namespace Qt3DInput {
 
 /*! \internal */
 QAxisAccumulatorPrivate::QAxisAccumulatorPrivate()
-    : Qt3DCore::QNodePrivate()
+    : Qt3DCore::QComponentPrivate()
     , m_sourceAxis(nullptr)
     , m_sourceAxisType(QAxisAccumulator::Velocity)
     , m_scale(1.0f)
@@ -124,7 +124,7 @@ void QAxisAccumulatorPrivate::setValue(float value)
     Constructs a new QAxisAccumulator instance with parent \a parent.
  */
 QAxisAccumulator::QAxisAccumulator(Qt3DCore::QNode *parent)
-    : Qt3DCore::QNode(*new QAxisAccumulatorPrivate, parent)
+    : Qt3DCore::QComponent(*new QAxisAccumulatorPrivate, parent)
 {
 }
 
diff --git a/src/input/frontend/qaxisaccumulator.h b/src/input/frontend/qaxisaccumulator.h
index 461f21c4a..009b2531c 100644
--- a/src/input/frontend/qaxisaccumulator.h
+++ b/src/input/frontend/qaxisaccumulator.h
@@ -41,7 +41,7 @@
 #define QT3DINPUT_QAXISACCUMULATOR_H
 
 #include <Qt3DInput/qt3dinput_global.h>
-#include <Qt3DCore/qnode.h>
+#include <Qt3DCore/qcomponent.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -50,7 +50,7 @@ namespace Qt3DInput {
 class QAxis;
 class QAxisAccumulatorPrivate;
 
-class QT3DINPUTSHARED_EXPORT QAxisAccumulator : public Qt3DCore::QNode
+class QT3DINPUTSHARED_EXPORT QAxisAccumulator : public Qt3DCore::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DInput::QAxis *sourceAxis READ sourceAxis WRITE setSourceAxis NOTIFY sourceAxisChanged)
diff --git a/src/input/frontend/qaxisaccumulator_p.h b/src/input/frontend/qaxisaccumulator_p.h
index a07284009..be0410c5c 100644
--- a/src/input/frontend/qaxisaccumulator_p.h
+++ b/src/input/frontend/qaxisaccumulator_p.h
@@ -51,14 +51,14 @@
 // We mean it.
 //
 
-#include <Qt3DCore/private/qnode_p.h>
+#include <Qt3DCore/private/qcomponent_p.h>
 #include <Qt3DInput/qaxisaccumulator.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DInput {
 
-class QAxisAccumulatorPrivate : public Qt3DCore::QNodePrivate
+class QAxisAccumulatorPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QAxisAccumulatorPrivate();
-- 
cgit v1.2.3