AxisActionHandlerJob: use better names for better understanding

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

4 files changed, 21 insertions, 20 deletions

diff --git a/src/input/backend/axisactionhandler.cpp b/src/input/backend/axisactionhandler.cpp
index fa6b05a7a..a7cbfc378 100644
--- a/src/input/backend/axisactionhandler.cpp
+++ b/src/input/backend/axisactionhandler.cpp
@@ -67,10 +67,10 @@ void AxisActionHandler::cleanup()
     m_logicalDevice = Qt3DCore::QNodeId();
 }
 
-void AxisActionHandler::setAndTransmitActionPayload(const ActionPayload &payloadState, const ActionPayload &deltaPayload)
+void AxisActionHandler::setAndTransmitActionPayload(const ActionStates &actionStates, const ActionPayload &deltaPayload)
 {
-    if (m_lastActionPayload != payloadState) {
-        m_lastActionPayload = payloadState;
+    if (m_lastActionStates != actionStates) {
+        m_lastActionStates = actionStates;
 
         Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(Qt3DCore::NodeUpdated, peerUuid()));
         e->setTargetNode(peerUuid());
diff --git a/src/input/backend/axisactionhandler_p.h b/src/input/backend/axisactionhandler_p.h
index 31efe03de..dd3d7431d 100644
--- a/src/input/backend/axisactionhandler_p.h
+++ b/src/input/backend/axisactionhandler_p.h
@@ -66,10 +66,10 @@ public:
     void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
     void cleanup();
     inline Qt3DCore::QNodeId logicalDevice() const { return m_logicalDevice; }
-    void setAndTransmitActionPayload(const ActionPayload &payloadState, const ActionPayload &deltaPayload);
+    void setAndTransmitActionPayload(const ActionStates &actionStates, const ActionPayload &deltaPayload);
     void setAndTransmitAxisPayload(const AxisPayload &payload);
     inline AxisPayload lastAxisPayload() const { return m_lastAxisPayload; }
-    inline ActionPayload lastActionPayload() const { return m_lastActionPayload; }
+    inline ActionPayload lastActionStates() const { return m_lastActionStates; }
 
 protected:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
@@ -77,7 +77,7 @@ protected:
 private:
     Qt3DCore::QNodeId m_logicalDevice;
     AxisPayload m_lastAxisPayload;
-    ActionPayload m_lastActionPayload;
+    ActionPayload m_lastActionStates;
 };
 
 class AxisActionHandlerNodeFunctor : public Qt3DCore::QBackendNodeFunctor
diff --git a/src/input/backend/axisactionpayload_p.h b/src/input/backend/axisactionpayload_p.h
index 1d4144aac..f31faba46 100644
--- a/src/input/backend/axisactionpayload_p.h
+++ b/src/input/backend/axisactionpayload_p.h
@@ -50,7 +50,6 @@
 
 #include <Qt3DInput/qt3dinput_global.h>
 #include <Qt3DCore/qnodeid.h>
-#include <QDebug>
 
 QT_BEGIN_NAMESPACE
 
@@ -97,6 +96,8 @@ struct ActionPayload
     }
 };
 
+typedef ActionPayload ActionStates;
+
 struct AxisPayload
 {
     QVector<AxisUpdate> axes;
diff --git a/src/input/backend/updatehandlerjob.cpp b/src/input/backend/updatehandlerjob.cpp
index 149c10f80..08b2633cb 100644
--- a/src/input/backend/updatehandlerjob.cpp
+++ b/src/input/backend/updatehandlerjob.cpp
@@ -117,34 +117,34 @@ void UpdateHandlerJob::updateAxes(LogicalDevice *device)
 
 void UpdateHandlerJob::updateActions(LogicalDevice *device)
 {
-    ActionPayload payload;
+    ActionStates actionStates;
 
     // Push each action into the payload to build the current action state for the frame
     Q_FOREACH (const Qt3DCore::QNodeId actionId, device->actions()) {
         const Action *action = m_handler->actionManager()->lookupResource(actionId);
-        ActionUpdate actionUpdate;
-        actionUpdate.name = action->name();
-        actionUpdate.id = actionId;
-        actionUpdate.triggered = action->actionTriggered();
-        payload.actions.push_back(actionUpdate);
+        ActionUpdate actionState;
+        actionState.id = actionId;
+        actionState.name = action->name();
+        actionState.triggered = action->actionTriggered();
+        actionStates.actions.push_back(actionState);
     }
 
     // Compare the action state against the previous payload state
-    ActionPayload oldPayload = m_axisActionHandler->lastActionPayload();
-    ActionPayload deltaPayload;
+    ActionStates oldActionStates = m_axisActionHandler->lastActionStates();
+    ActionPayload updatePayload;
 
     // Build up a delta payload
-    Q_FOREACH (const ActionUpdate &actionUpdate, payload.actions) {
-        const int posOfActionInOldPayload = containsAction(actionUpdate.id, oldPayload);
+    Q_FOREACH (const ActionUpdate &actionUpdate, actionStates.actions) {
+        const int posOfActionInOldPayload = containsAction(actionUpdate.id, oldActionStates);
         // If the action is not in the old payload or
         // is in the old payload state but has a different value
         // we add it to the delta payload
         if (posOfActionInOldPayload < 0 ||
-                oldPayload.actions.at(posOfActionInOldPayload).triggered != actionUpdate.triggered)
-            deltaPayload.actions.push_back(actionUpdate);
+                oldActionStates.actions.at(posOfActionInOldPayload).triggered != actionUpdate.triggered)
+            updatePayload.actions.push_back(actionUpdate);
     }
 
-    m_axisActionHandler->setAndTransmitActionPayload(payload, deltaPayload);
+    m_axisActionHandler->setAndTransmitActionPayload(actionStates, updatePayload);
 }
 
 } // Input