Bring more type safety to the buttons properties

The API uses QList<int> now to benefit from the default support for this
type in QML. We internally store it as a QVector<int> though so that the
whole backend uses QVector<int> for them. It means we still have a
conversion going on but it's not really on any hot patch and those lists
will be small anyway.

This conversion could be eliminated by hacking qv4sequenceobject.cpp in
qtdeclarative but we're close enough to deadline that it's not worth the
effort IMHO.

Change-Id: I7ef16ec351cc54cc418a8f5c340397f58422add3
Task-number: QTBUG-51467
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

2 files changed, 18 insertions, 18 deletions

diff --git a/src/extras/defaults/qfirstpersoncameracontroller.cpp b/src/extras/defaults/qfirstpersoncameracontroller.cpp
index 1e42223a2..65a36f2bf 100644
--- a/src/extras/defaults/qfirstpersoncameracontroller.cpp
+++ b/src/extras/defaults/qfirstpersoncameracontroller.cpp
@@ -100,12 +100,12 @@ void QFirstPersonCameraControllerPrivate::init()
     //// Actions
 
     // Left Mouse Button Action
-    m_leftMouseButtonInput->setButtons(QVariantList() << Qt::LeftButton);
+    m_leftMouseButtonInput->setButtons(QList<int>() << Qt::LeftButton);
     m_leftMouseButtonInput->setSourceDevice(m_mouseDevice);
     m_leftMouseButtonAction->addInput(m_leftMouseButtonInput);
 
     // Fine Motion Action
-    m_fineMotionKeyInput->setButtons(QVariantList() << Qt::Key_Shift);
+    m_fineMotionKeyInput->setButtons(QList<int>() << Qt::Key_Shift);
     m_fineMotionKeyInput->setSourceDevice(m_keyboardDevice);
     m_fineMotionAction->addInput(m_fineMotionKeyInput);
 
@@ -122,37 +122,37 @@ void QFirstPersonCameraControllerPrivate::init()
     m_ryAxis->addInput(m_mouseRyInput);
 
     // Keyboard Pos Tx
-    m_keyboardTxPosInput->setButtons(QVariantList() << Qt::Key_Right);
+    m_keyboardTxPosInput->setButtons(QList<int>() << Qt::Key_Right);
     m_keyboardTxPosInput->setScale(1.0f);
     m_keyboardTxPosInput->setSourceDevice(m_keyboardDevice);
     m_txAxis->addInput(m_keyboardTxPosInput);
 
     // Keyboard Pos Ty
-    m_keyboardTyPosInput->setButtons(QVariantList() << Qt::Key_PageUp);
+    m_keyboardTyPosInput->setButtons(QList<int>() << Qt::Key_PageUp);
     m_keyboardTyPosInput->setScale(1.0f);
     m_keyboardTyPosInput->setSourceDevice(m_keyboardDevice);
     m_tyAxis->addInput(m_keyboardTyPosInput);
 
     // Keyboard Pos Tz
-    m_keyboardTzPosInput->setButtons(QVariantList() << Qt::Key_Up);
+    m_keyboardTzPosInput->setButtons(QList<int>() << Qt::Key_Up);
     m_keyboardTzPosInput->setScale(1.0f);
     m_keyboardTzPosInput->setSourceDevice(m_keyboardDevice);
     m_tzAxis->addInput(m_keyboardTzPosInput);
 
     // Keyboard Neg Tx
-    m_keyboardTxNegInput->setButtons(QVariantList() << Qt::Key_Left);
+    m_keyboardTxNegInput->setButtons(QList<int>() << Qt::Key_Left);
     m_keyboardTxNegInput->setScale(-1.0f);
     m_keyboardTxNegInput->setSourceDevice(m_keyboardDevice);
     m_txAxis->addInput(m_keyboardTxNegInput);
 
     // Keyboard Neg Ty
-    m_keyboardTyNegInput->setButtons(QVariantList() << Qt::Key_PageDown);
+    m_keyboardTyNegInput->setButtons(QList<int>() << Qt::Key_PageDown);
     m_keyboardTyNegInput->setScale(-1.0f);
     m_keyboardTyNegInput->setSourceDevice(m_keyboardDevice);
     m_tyAxis->addInput(m_keyboardTyNegInput);
 
     // Keyboard Neg Tz
-    m_keyboardTzNegInput->setButtons(QVariantList() << Qt::Key_Down);
+    m_keyboardTzNegInput->setButtons(QList<int>() << Qt::Key_Down);
     m_keyboardTzNegInput->setScale(-1.0f);
     m_keyboardTzNegInput->setSourceDevice(m_keyboardDevice);
     m_tzAxis->addInput(m_keyboardTzNegInput);
diff --git a/src/extras/defaults/qorbitcontrol.cpp b/src/extras/defaults/qorbitcontrol.cpp
index 47703ea17..8d41a241e 100644
--- a/src/extras/defaults/qorbitcontrol.cpp
+++ b/src/extras/defaults/qorbitcontrol.cpp
@@ -97,22 +97,22 @@ void QOrbitControlPrivate::init()
     //// Actions
 
     // Left Mouse Button Action
-    m_leftMouseButtonInput->setButtons(QVariantList() << Qt::LeftButton);
+    m_leftMouseButtonInput->setButtons(QList<int>() << Qt::LeftButton);
     m_leftMouseButtonInput->setSourceDevice(m_mouseDevice);
     m_leftMouseButtonAction->addInput(m_leftMouseButtonInput);
 
     // Right Mouse Button Action
-    m_rightMouseButtonInput->setButtons(QVariantList() << Qt::RightButton);
+    m_rightMouseButtonInput->setButtons(QList<int>() << Qt::RightButton);
     m_rightMouseButtonInput->setSourceDevice(m_mouseDevice);
     m_rightMouseButtonAction->addInput(m_rightMouseButtonInput);
 
     // Alt Button Action
-    m_altButtonInput->setButtons(QVariantList() << Qt::Key_Alt);
+    m_altButtonInput->setButtons(QList<int>() << Qt::Key_Alt);
     m_altButtonInput->setSourceDevice(m_keyboardDevice);
     m_altButtonAction->addInput(m_altButtonInput);
 
     // Shift Button Action
-    m_shiftButtonInput->setButtons(QVariantList() << Qt::Key_Shift);
+    m_shiftButtonInput->setButtons(QList<int>() << Qt::Key_Shift);
     m_shiftButtonInput->setSourceDevice(m_keyboardDevice);
     m_shiftButtonAction->addInput(m_shiftButtonInput);
 
@@ -129,37 +129,37 @@ void QOrbitControlPrivate::init()
     m_ryAxis->addInput(m_mouseRyInput);
 
     // Keyboard Pos Tx
-    m_keyboardTxPosInput->setButtons(QVariantList() << Qt::Key_Right);
+    m_keyboardTxPosInput->setButtons(QList<int>() << Qt::Key_Right);
     m_keyboardTxPosInput->setScale(1.0f);
     m_keyboardTxPosInput->setSourceDevice(m_keyboardDevice);
     m_txAxis->addInput(m_keyboardTxPosInput);
 
     // Keyboard Pos Tz
-    m_keyboardTzPosInput->setButtons(QVariantList() << Qt::Key_PageUp);
+    m_keyboardTzPosInput->setButtons(QList<int>() << Qt::Key_PageUp);
     m_keyboardTzPosInput->setScale(1.0f);
     m_keyboardTzPosInput->setSourceDevice(m_keyboardDevice);
     m_tzAxis->addInput(m_keyboardTzPosInput);
 
     // Keyboard Pos Ty
-    m_keyboardTyPosInput->setButtons(QVariantList() << Qt::Key_Up);
+    m_keyboardTyPosInput->setButtons(QList<int>() << Qt::Key_Up);
     m_keyboardTyPosInput->setScale(1.0f);
     m_keyboardTyPosInput->setSourceDevice(m_keyboardDevice);
     m_tyAxis->addInput(m_keyboardTyPosInput);
 
     // Keyboard Neg Tx
-    m_keyboardTxNegInput->setButtons(QVariantList() << Qt::Key_Left);
+    m_keyboardTxNegInput->setButtons(QList<int>() << Qt::Key_Left);
     m_keyboardTxNegInput->setScale(-1.0f);
     m_keyboardTxNegInput->setSourceDevice(m_keyboardDevice);
     m_txAxis->addInput(m_keyboardTxNegInput);
 
     // Keyboard Neg Tz
-    m_keyboardTzNegInput->setButtons(QVariantList() << Qt::Key_PageDown);
+    m_keyboardTzNegInput->setButtons(QList<int>() << Qt::Key_PageDown);
     m_keyboardTzNegInput->setScale(-1.0f);
     m_keyboardTzNegInput->setSourceDevice(m_keyboardDevice);
     m_tzAxis->addInput(m_keyboardTzNegInput);
 
     // Keyboard Neg Ty
-    m_keyboardTyNegInput->setButtons(QVariantList() << Qt::Key_Down);
+    m_keyboardTyNegInput->setButtons(QList<int>() << Qt::Key_Down);
     m_keyboardTyNegInput->setScale(-1.0f);
     m_keyboardTyNegInput->setSourceDevice(m_keyboardDevice);
     m_tyAxis->addInput(m_keyboardTyNegInput);