Action input nodes inherit from the abstract class

ActionInput, InputChord and InputSequence all inherit from
AbstractActionInput now. Their process method does nothing yet though.

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

6 files changed, 36 insertions, 15 deletions

diff --git a/src/input/backend/actioninput.cpp b/src/input/backend/actioninput.cpp
index b4cdd77ca..7b620611e 100644
--- a/src/input/backend/actioninput.cpp
+++ b/src/input/backend/actioninput.cpp
@@ -50,7 +50,7 @@ namespace Qt3DInput {
 namespace Input {
 
 ActionInput::ActionInput()
-    : Qt3DCore::QBackendNode()
+    : AbstractActionInput()
     , m_buttons(0)
 {
 }
@@ -65,7 +65,7 @@ void ActionInput::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &
 
 void ActionInput::cleanup()
 {
-    QBackendNode::setEnabled(false);
+    setEnabled(false);
     m_sourceDevice = Qt3DCore::QNodeId();
     m_buttons.clear();
 }
@@ -80,7 +80,12 @@ void ActionInput::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
             m_buttons = propertyChange->value().value<QVector<int>>();
         }
     }
-    QBackendNode::sceneChangeEvent(e);
+    AbstractActionInput::sceneChangeEvent(e);
+}
+
+bool ActionInput::process(InputHandler *inputHandler, qint64 currentTime)
+{
+    return false;
 }
 
 } // namespace Input
diff --git a/src/input/backend/actioninput_p.h b/src/input/backend/actioninput_p.h
index c3e80ba63..da99c985e 100644
--- a/src/input/backend/actioninput_p.h
+++ b/src/input/backend/actioninput_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <Qt3DCore/qbackendnode.h>
+#include <Qt3DInput/private/abstractactioninput_p.h>
 #include <Qt3DCore/qnodeid.h>
 
 QT_BEGIN_NAMESPACE
@@ -60,7 +60,7 @@ namespace Qt3DInput {
 
 namespace Input {
 
-class Q_AUTOTEST_EXPORT ActionInput : public Qt3DCore::QBackendNode
+class Q_AUTOTEST_EXPORT ActionInput : public AbstractActionInput
 {
 public:
     ActionInput();
@@ -70,6 +70,8 @@ public:
     inline Qt3DCore::QNodeId sourceDevice() const { return m_sourceDevice; }
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
+    bool process(InputHandler *inputHandler, qint64 currentTime) Q_DECL_OVERRIDE;
+
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
 
diff --git a/src/input/backend/inputchord.cpp b/src/input/backend/inputchord.cpp
index 7ecd611a8..81394c935 100644
--- a/src/input/backend/inputchord.cpp
+++ b/src/input/backend/inputchord.cpp
@@ -51,7 +51,7 @@ namespace Qt3DInput {
 namespace Input {
 
 InputChord::InputChord()
-    : Qt3DCore::QBackendNode()
+    : AbstractActionInput()
     , m_chords()
     , m_inputsToTrigger()
     , m_timeout(0)
@@ -69,7 +69,7 @@ void InputChord::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &c
 
 void InputChord::cleanup()
 {
-    QBackendNode::setEnabled(false);
+    setEnabled(false);
     m_timeout = 0;
     m_startTime = 0;
     m_chords.clear();
@@ -129,7 +129,12 @@ void InputChord::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     default:
         break;
     }
-    QBackendNode::sceneChangeEvent(e);
+    AbstractActionInput::sceneChangeEvent(e);
+}
+
+bool InputChord::process(InputHandler *inputHandler, qint64 currentTime)
+{
+    return false;
 }
 
 } // namespace Input
diff --git a/src/input/backend/inputchord_p.h b/src/input/backend/inputchord_p.h
index db197df3c..89e130878 100644
--- a/src/input/backend/inputchord_p.h
+++ b/src/input/backend/inputchord_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <Qt3DCore/qbackendnode.h>
+#include <Qt3DInput/private/abstractactioninput_p.h>
 #include <Qt3DCore/qnodeid.h>
 
 QT_BEGIN_NAMESPACE
@@ -60,7 +60,7 @@ namespace Qt3DInput {
 
 namespace Input {
 
-class Q_AUTOTEST_EXPORT InputChord : public Qt3DCore::QBackendNode
+class Q_AUTOTEST_EXPORT InputChord : public AbstractActionInput
 {
 public:
     InputChord();
@@ -74,6 +74,8 @@ public:
     bool actionTriggered(Qt3DCore::QNodeId input);
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
+    bool process(InputHandler *inputHandler, qint64 currentTime) Q_DECL_OVERRIDE;
+
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
 
diff --git a/src/input/backend/inputsequence.cpp b/src/input/backend/inputsequence.cpp
index aae88f9a1..94616fdac 100644
--- a/src/input/backend/inputsequence.cpp
+++ b/src/input/backend/inputsequence.cpp
@@ -53,7 +53,7 @@ namespace Qt3DInput {
 namespace Input {
 
 InputSequence::InputSequence()
-    : Qt3DCore::QBackendNode()
+    : AbstractActionInput()
     , m_sequences()
     , m_inputsToTrigger()
     , m_timeout(0)
@@ -74,7 +74,7 @@ void InputSequence::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr
 
 void InputSequence::cleanup()
 {
-    QBackendNode::setEnabled(false);
+    setEnabled(false);
     m_timeout = 0;
     m_buttonInterval = 0;
     m_startTime = 0;
@@ -154,7 +154,12 @@ void InputSequence::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     default:
         break;
     }
-    QBackendNode::sceneChangeEvent(e);
+    AbstractActionInput::sceneChangeEvent(e);
+}
+
+bool InputSequence::process(InputHandler *inputHandler, qint64 currentTime)
+{
+    return false;
 }
 
 } // namespace Input
diff --git a/src/input/backend/inputsequence_p.h b/src/input/backend/inputsequence_p.h
index a76457f4e..618342ac1 100644
--- a/src/input/backend/inputsequence_p.h
+++ b/src/input/backend/inputsequence_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <Qt3DCore/qbackendnode.h>
+#include <Qt3DInput/private/abstractactioninput_p.h>
 #include <Qt3DCore/qnodeid.h>
 
 QT_BEGIN_NAMESPACE
@@ -60,7 +60,7 @@ namespace Qt3DInput {
 
 namespace Input {
 
-class Q_AUTOTEST_EXPORT InputSequence : public Qt3DCore::QBackendNode
+class Q_AUTOTEST_EXPORT InputSequence : public AbstractActionInput
 {
 public:
     InputSequence();
@@ -76,6 +76,8 @@ public:
     bool actionTriggered(Qt3DCore::QNodeId input, const qint64 currentTime);
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
+    bool process(InputHandler *inputHandler, qint64 currentTime) Q_DECL_OVERRIDE;
+
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;