diff options
author | Kevin Ottens <kevin.ottens@kdab.com> | 2016-05-03 12:14:22 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-04 08:33:28 +0000 |
commit | 67a6c7fc59f750c1b535b545983625d3ebc86cdf (patch) | |
tree | 72f69f8bdd597881a50f57f98a6cea32d80c4d91 /src/extras/defaults/qorbitcameracontroller.cpp | |
parent | 5f9831511b6832d1f9cce118496289816c1110ce (diff) |
Change QList<int> properties to QVector<int>
Now that QVector<int> is supported by QML, let's switch to it and avoid
the conversion cost altogether.
Change-Id: I1f6bfb29cab38547d62fc7ec3ee6a322ca400f70
Task-number: QTBUG-51467
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/extras/defaults/qorbitcameracontroller.cpp')
-rw-r--r-- | src/extras/defaults/qorbitcameracontroller.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/extras/defaults/qorbitcameracontroller.cpp b/src/extras/defaults/qorbitcameracontroller.cpp index 57f1c2e5b..deeec7f0d 100644 --- a/src/extras/defaults/qorbitcameracontroller.cpp +++ b/src/extras/defaults/qorbitcameracontroller.cpp @@ -97,22 +97,22 @@ void QOrbitCameraControllerPrivate::init() //// Actions // Left Mouse Button Action - m_leftMouseButtonInput->setButtons(QList<int>() << Qt::LeftButton); + m_leftMouseButtonInput->setButtons(QVector<int>() << Qt::LeftButton); m_leftMouseButtonInput->setSourceDevice(m_mouseDevice); m_leftMouseButtonAction->addInput(m_leftMouseButtonInput); // Right Mouse Button Action - m_rightMouseButtonInput->setButtons(QList<int>() << Qt::RightButton); + m_rightMouseButtonInput->setButtons(QVector<int>() << Qt::RightButton); m_rightMouseButtonInput->setSourceDevice(m_mouseDevice); m_rightMouseButtonAction->addInput(m_rightMouseButtonInput); // Alt Button Action - m_altButtonInput->setButtons(QList<int>() << Qt::Key_Alt); + m_altButtonInput->setButtons(QVector<int>() << Qt::Key_Alt); m_altButtonInput->setSourceDevice(m_keyboardDevice); m_altButtonAction->addInput(m_altButtonInput); // Shift Button Action - m_shiftButtonInput->setButtons(QList<int>() << Qt::Key_Shift); + m_shiftButtonInput->setButtons(QVector<int>() << Qt::Key_Shift); m_shiftButtonInput->setSourceDevice(m_keyboardDevice); m_shiftButtonAction->addInput(m_shiftButtonInput); @@ -129,37 +129,37 @@ void QOrbitCameraControllerPrivate::init() m_ryAxis->addInput(m_mouseRyInput); // Keyboard Pos Tx - m_keyboardTxPosInput->setButtons(QList<int>() << Qt::Key_Right); + m_keyboardTxPosInput->setButtons(QVector<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(QList<int>() << Qt::Key_PageUp); + m_keyboardTzPosInput->setButtons(QVector<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(QList<int>() << Qt::Key_Up); + m_keyboardTyPosInput->setButtons(QVector<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(QList<int>() << Qt::Key_Left); + m_keyboardTxNegInput->setButtons(QVector<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(QList<int>() << Qt::Key_PageDown); + m_keyboardTzNegInput->setButtons(QVector<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(QList<int>() << Qt::Key_Down); + m_keyboardTyNegInput->setButtons(QVector<int>() << Qt::Key_Down); m_keyboardTyNegInput->setScale(-1.0f); m_keyboardTyNegInput->setSourceDevice(m_keyboardDevice); m_tyAxis->addInput(m_keyboardTyNegInput); |