InputSequence: use m_enabled member from QBackendNode

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

2 files changed, 3 insertions, 9 deletions

diff --git a/src/input/backend/inputsequence.cpp b/src/input/backend/inputsequence.cpp
index 98b3be0ba..11aba9f08 100644
--- a/src/input/backend/inputsequence.cpp
+++ b/src/input/backend/inputsequence.cpp
@@ -58,14 +58,12 @@ InputSequence::InputSequence()
     , m_buttonInterval(0)
     , m_startTime(0)
     , m_lastInputTime(0)
-    , m_enabled(false)
 {
 }
 
 void InputSequence::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QInputSequence *input = static_cast<QInputSequence *>(peer);
-    m_enabled = input->isEnabled();
     m_timeout = input->timeout();
     m_buttonInterval = input->buttonInterval();
     Q_FOREACH (QAbstractActionInput *i, input->inputs())
@@ -76,7 +74,6 @@ void InputSequence::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr
 {
     const auto typedChange = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<QInputSequenceData>>(change);
     const auto &data = typedChange->data;
-    m_enabled = change->isNodeEnabled();
     m_inputs = data.inputIds;
     m_timeout = data.timeout;
     m_buttonInterval = data.buttonInterval;
@@ -84,7 +81,7 @@ void InputSequence::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr
 
 void InputSequence::cleanup()
 {
-    m_enabled = false;
+    QBackendNode::setEnabled(false);
     m_timeout = 0;
     m_buttonInterval = 0;
     m_startTime = 0;
@@ -134,9 +131,7 @@ void InputSequence::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     Qt3DCore::QScenePropertyChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QScenePropertyChange>(e);
     if (e->type() == Qt3DCore::NodeUpdated) {
-        if (propertyChange->propertyName() == QByteArrayLiteral("enabled")) {
-            m_enabled = propertyChange->value().toBool();
-        } else if (propertyChange->propertyName() == QByteArrayLiteral("timeout")) {
+        if (propertyChange->propertyName() == QByteArrayLiteral("timeout")) {
             m_timeout = propertyChange->value().toInt();
         } else if (propertyChange->propertyName() == QByteArrayLiteral("buttonInterval")) {
             m_buttonInterval = propertyChange->value().toInt();
@@ -152,6 +147,7 @@ void InputSequence::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
             m_inputsToTrigger.removeOne(propertyChange->value().value<Qt3DCore::QNodeId>());
         }
     }
+    QBackendNode::sceneChangeEvent(e);
 }
 
 } // namespace Input
diff --git a/src/input/backend/inputsequence_p.h b/src/input/backend/inputsequence_p.h
index 326ab35da..75b31531e 100644
--- a/src/input/backend/inputsequence_p.h
+++ b/src/input/backend/inputsequence_p.h
@@ -72,7 +72,6 @@ public:
     inline int buttonInterval() const { return m_buttonInterval; }
     inline qint64 startTime() const { return m_startTime; }
     void setStartTime(qint64 time);
-    inline bool isEnabled() const { return m_enabled; }
     bool sequenceTriggered() const;
     void reset();
     bool actionTriggered(Qt3DCore::QNodeId input, const qint64 currentTime);
@@ -88,7 +87,6 @@ private:
     qint64 m_startTime;
     qint64 m_lastInputTime;
     Qt3DCore::QNodeId m_lastInputId;
-    bool m_enabled;
 };
 
 } // namespace Input