Frontend is in ms but backend in ns

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

5 files changed, 14 insertions, 12 deletions

diff --git a/src/input/backend/abstractactioninput_p.h b/src/input/backend/abstractactioninput_p.h
index d672a546e..267d276c7 100644
--- a/src/input/backend/abstractactioninput_p.h
+++ b/src/input/backend/abstractactioninput_p.h
@@ -67,6 +67,8 @@ class Q_AUTOTEST_EXPORT AbstractActionInput : public Qt3DCore::QBackendNode
 public:
     AbstractActionInput();
 
+    inline static qint64 milliToNano(qint64 milli) { return milli * 1000000; }
+
     virtual bool process(InputHandler *inputHandler, qint64 currentTime) = 0;
 };
 
diff --git a/src/input/backend/inputchord.cpp b/src/input/backend/inputchord.cpp
index 260048f99..a37bb8ea4 100644
--- a/src/input/backend/inputchord.cpp
+++ b/src/input/backend/inputchord.cpp
@@ -65,7 +65,7 @@ void InputChord::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &c
     const auto typedChange = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<QInputChordData>>(change);
     const QInputChordData &data = typedChange->data;
     m_chords = data.chordIds;
-    m_timeout = data.timeout;
+    m_timeout = milliToNano(data.timeout);
     m_inputsToTrigger = m_chords;
 }
 
@@ -106,7 +106,7 @@ void InputChord::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     case Qt3DCore::PropertyUpdated: {
         const auto change = qSharedPointerCast<Qt3DCore::QPropertyUpdatedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("timeout"))
-            m_timeout = change->value().toInt();
+            m_timeout = milliToNano(change->value().toInt());
         break;
     }
 
diff --git a/src/input/backend/inputchord_p.h b/src/input/backend/inputchord_p.h
index 89e130878..7f51f5d96 100644
--- a/src/input/backend/inputchord_p.h
+++ b/src/input/backend/inputchord_p.h
@@ -67,7 +67,7 @@ public:
     void cleanup();
 
     inline QVector<Qt3DCore::QNodeId> chords() const { return m_chords; }
-    inline int timeout() const { return m_timeout; }
+    inline qint64 timeout() const { return m_timeout; }
     inline qint64 startTime() const { return m_startTime; }
     void setStartTime(qint64 time);
     void reset();
@@ -81,7 +81,7 @@ private:
 
     QVector<Qt3DCore::QNodeId> m_chords;
     QVector<Qt3DCore::QNodeId> m_inputsToTrigger;
-    int m_timeout;
+    qint64 m_timeout;
     qint64 m_startTime;
 };
 
diff --git a/src/input/backend/inputsequence.cpp b/src/input/backend/inputsequence.cpp
index 66ce6e920..378a7d33d 100644
--- a/src/input/backend/inputsequence.cpp
+++ b/src/input/backend/inputsequence.cpp
@@ -69,8 +69,8 @@ void InputSequence::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr
     const auto typedChange = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<QInputSequenceData>>(change);
     const QInputSequenceData &data = typedChange->data;
     m_sequences = data.sequenceIds;
-    m_timeout = data.timeout;
-    m_buttonInterval = data.buttonInterval;
+    m_timeout = milliToNano(data.timeout);
+    m_buttonInterval = milliToNano(data.buttonInterval);
     m_inputsToTrigger = m_sequences;
 }
 
@@ -131,9 +131,9 @@ void InputSequence::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     case Qt3DCore::PropertyUpdated: {
         const auto change = qSharedPointerCast<Qt3DCore::QPropertyUpdatedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("timeout")) {
-            m_timeout = change->value().toInt();
+            m_timeout = milliToNano(change->value().toInt());
         } else if (change->propertyName() == QByteArrayLiteral("buttonInterval")) {
-            m_buttonInterval = change->value().toInt();
+            m_buttonInterval = milliToNano(change->value().toInt());
         }
         break;
     }
diff --git a/src/input/backend/inputsequence_p.h b/src/input/backend/inputsequence_p.h
index 618342ac1..28cb1c0e1 100644
--- a/src/input/backend/inputsequence_p.h
+++ b/src/input/backend/inputsequence_p.h
@@ -67,8 +67,8 @@ public:
     void cleanup();
 
     inline QVector<Qt3DCore::QNodeId> sequences() const { return m_sequences; }
-    inline int timeout() const { return m_timeout; }
-    inline int buttonInterval() const { return m_buttonInterval; }
+    inline qint64 timeout() const { return m_timeout; }
+    inline qint64 buttonInterval() const { return m_buttonInterval; }
     inline qint64 startTime() const { return m_startTime; }
     void setStartTime(qint64 time);
     bool sequenceTriggered() const;
@@ -83,8 +83,8 @@ private:
 
     QVector<Qt3DCore::QNodeId> m_sequences;
     QVector<Qt3DCore::QNodeId> m_inputsToTrigger;
-    int m_timeout;
-    int m_buttonInterval;
+    qint64 m_timeout;
+    qint64 m_buttonInterval;
     qint64 m_startTime;
     qint64 m_lastInputTime;
     Qt3DCore::QNodeId m_lastInputId;