From 39d0041f15601cee499c959702b004cbd721bed9 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Wed, 8 Jul 2020 15:56:06 +0200
Subject: Use QList instead of QVector in implementation and docs

Fix some const correctness.
Use list-initialization.

Task-number: QTBUG-84469
Change-Id: I9c56742581f48f89a3b02e4121fae414117c7a25
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 src/input/frontend/qabstractphysicaldevice_p.h | 8 ++++----
 src/input/frontend/qaction_p.h                 | 4 ++--
 src/input/frontend/qactioninput_p.h            | 4 ++--
 src/input/frontend/qaxis_p.h                   | 4 ++--
 src/input/frontend/qaxissetting_p.h            | 4 ++--
 src/input/frontend/qbuttonaxisinput_p.h        | 4 ++--
 src/input/frontend/qinputaspect.cpp            | 2 +-
 src/input/frontend/qinputchord_p.h             | 2 +-
 src/input/frontend/qinputdeviceintegration_p.h | 2 +-
 src/input/frontend/qinputsequence_p.h          | 2 +-
 src/input/frontend/qlogicaldevice_p.h          | 8 ++++----
 11 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'src/input/frontend')

diff --git a/src/input/frontend/qabstractphysicaldevice_p.h b/src/input/frontend/qabstractphysicaldevice_p.h
index fc8ad561c..39c869fdf 100644
--- a/src/input/frontend/qabstractphysicaldevice_p.h
+++ b/src/input/frontend/qabstractphysicaldevice_p.h
@@ -53,8 +53,8 @@
 
 #include <Qt3DInput/qt3dinput_global.h>
 #include <QtCore/qhash.h>
+#include <QtCore/qlist.h>
 #include <QtCore/qmutex.h>
-#include <QtCore/qvector.h>
 
 #include <Qt3DInput/private/qt3dinput_global_p.h>
 #include <Qt3DCore/private/qnode_p.h>
@@ -72,12 +72,12 @@ public:
     ~QAbstractPhysicalDevicePrivate();
 
     Q_DECLARE_PUBLIC(QAbstractPhysicalDevice)
-    QVector<QAxisSetting *> m_axisSettings;
+    QList<QAxisSetting *> m_axisSettings;
     QHash<QString, int> m_axesHash;
     QHash<QString, int> m_buttonsHash;
 
-    QVector<QPair<int, qreal>> m_pendingAxisEvents;
-    QVector<QPair<int, qreal>> m_pendingButtonsEvents;
+    QList<QPair<int, qreal>> m_pendingAxisEvents;
+    QList<QPair<int, qreal>> m_pendingButtonsEvents;
 
     void postAxisEvent(int axis, qreal value);
     void postButtonEvent(int button, qreal value);
diff --git a/src/input/frontend/qaction_p.h b/src/input/frontend/qaction_p.h
index 89c26323b..f2ce7b591 100644
--- a/src/input/frontend/qaction_p.h
+++ b/src/input/frontend/qaction_p.h
@@ -71,7 +71,7 @@ public:
 
     Q_DECLARE_PUBLIC(QAction)
 
-    QVector<QAbstractActionInput *> m_inputs;
+    QList<QAbstractActionInput *> m_inputs;
     bool m_active;
 
     void setActive(bool active)
@@ -85,7 +85,7 @@ public:
 
 struct QActionData
 {
-    QVector<Qt3DCore::QNodeId> inputIds;
+    QList<Qt3DCore::QNodeId> inputIds;
 };
 
 } // namespace Qt3DInput
diff --git a/src/input/frontend/qactioninput_p.h b/src/input/frontend/qactioninput_p.h
index 74a69d68c..28df810d7 100644
--- a/src/input/frontend/qactioninput_p.h
+++ b/src/input/frontend/qactioninput_p.h
@@ -70,14 +70,14 @@ class QActionInputPrivate : public QAbstractActionInputPrivate
 public:
     QActionInputPrivate();
 
-    QVector<int> m_buttons;
+    QList<int> m_buttons;
     QAbstractPhysicalDevice *m_sourceDevice;
 };
 
 struct QActionInputData
 {
     Qt3DCore::QNodeId sourceDeviceId;
-    QVector<int> buttons;
+    QList<int> buttons;
 };
 
 } // Qt3DInput
diff --git a/src/input/frontend/qaxis_p.h b/src/input/frontend/qaxis_p.h
index 8d0582aa5..064119122 100644
--- a/src/input/frontend/qaxis_p.h
+++ b/src/input/frontend/qaxis_p.h
@@ -69,7 +69,7 @@ public:
 
     Q_DECLARE_PUBLIC(QAxis)
 
-    QVector<QAbstractAxisInput *> m_inputs;
+    QList<QAbstractAxisInput *> m_inputs;
     float m_value;
 
     void setValue(float value)
@@ -83,7 +83,7 @@ public:
 
 struct QAxisData
 {
-    QVector<Qt3DCore::QNodeId> inputIds;
+    QList<Qt3DCore::QNodeId> inputIds;
 };
 
 } // Qt3DInput
diff --git a/src/input/frontend/qaxissetting_p.h b/src/input/frontend/qaxissetting_p.h
index b3d162e8f..5e7f57171 100644
--- a/src/input/frontend/qaxissetting_p.h
+++ b/src/input/frontend/qaxissetting_p.h
@@ -68,14 +68,14 @@ public:
     {}
 
     float m_deadZoneRadius;
-    QVector<int> m_axes;
+    QList<int> m_axes;
     bool m_smooth;
 };
 
 struct QAxisSettingData
 {
     float deadZoneRadius;
-    QVector<int> axes;
+    QList<int> axes;
     bool smooth;
 };
 
diff --git a/src/input/frontend/qbuttonaxisinput_p.h b/src/input/frontend/qbuttonaxisinput_p.h
index 849498f06..4c16e0a9a 100644
--- a/src/input/frontend/qbuttonaxisinput_p.h
+++ b/src/input/frontend/qbuttonaxisinput_p.h
@@ -67,7 +67,7 @@ public:
         , m_deceleration(-1.0f)
     {}
 
-    QVector<int> m_buttons;
+    QList<int> m_buttons;
     float m_scale;
     float m_acceleration;
     float m_deceleration;
@@ -75,7 +75,7 @@ public:
 
 struct QButtonAxisInputData : public QAbstractAxisInputData
 {
-    QVector<int> buttons;
+    QList<int> buttons;
     float scale;
     float acceleration;
     float deceleration;
diff --git a/src/input/frontend/qinputaspect.cpp b/src/input/frontend/qinputaspect.cpp
index 3d2b6526b..0f95f93a3 100644
--- a/src/input/frontend/qinputaspect.cpp
+++ b/src/input/frontend/qinputaspect.cpp
@@ -242,7 +242,7 @@ std::vector<QAspectJobPtr> QInputAspect::jobsToExecute(qint64 time)
         jobs.insert(jobs.end(), std::make_move_iterator(integrationJobs.begin()), std::make_move_iterator(integrationJobs.end()));
     }
 
-    const QVector<Qt3DCore::QNodeId> proxiesToLoad = d->m_inputHandler->physicalDeviceProxyManager()->takePendingProxiesToLoad();
+    const QList<Qt3DCore::QNodeId> proxiesToLoad = d->m_inputHandler->physicalDeviceProxyManager()->takePendingProxiesToLoad();
     if (!proxiesToLoad.isEmpty()) {
         // Since loading wrappers occurs quite rarely, no point in keeping the job in a
         // member variable
diff --git a/src/input/frontend/qinputchord_p.h b/src/input/frontend/qinputchord_p.h
index 37cbbd9f2..2baa93340 100644
--- a/src/input/frontend/qinputchord_p.h
+++ b/src/input/frontend/qinputchord_p.h
@@ -71,7 +71,7 @@ public:
     QInputChordPrivate();
 
     int m_timeout;
-    QVector<QAbstractActionInput *> m_chords;
+    QList<QAbstractActionInput *> m_chords;
 };
 
 struct QInputChordData
diff --git a/src/input/frontend/qinputdeviceintegration_p.h b/src/input/frontend/qinputdeviceintegration_p.h
index 438e407fb..9a5618b04 100644
--- a/src/input/frontend/qinputdeviceintegration_p.h
+++ b/src/input/frontend/qinputdeviceintegration_p.h
@@ -92,7 +92,7 @@ public:
 
     virtual std::vector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) = 0;
     virtual QAbstractPhysicalDevice *createPhysicalDevice(const QString &name) = 0;
-    virtual QVector<Qt3DCore::QNodeId> physicalDevices() const = 0;
+    virtual QList<Qt3DCore::QNodeId> physicalDevices() const = 0;
     virtual QAbstractPhysicalDeviceBackendNode *physicalDevice(Qt3DCore::QNodeId id) const = 0;
     virtual QStringList deviceNames() const = 0;
 
diff --git a/src/input/frontend/qinputsequence_p.h b/src/input/frontend/qinputsequence_p.h
index b2807b2d5..bd7618576 100644
--- a/src/input/frontend/qinputsequence_p.h
+++ b/src/input/frontend/qinputsequence_p.h
@@ -72,7 +72,7 @@ public:
 
     int m_timeout;
     int m_buttonInterval;
-    QVector<QAbstractActionInput *> m_sequences;
+    QList<QAbstractActionInput *> m_sequences;
 };
 
 struct QInputSequenceData
diff --git a/src/input/frontend/qlogicaldevice_p.h b/src/input/frontend/qlogicaldevice_p.h
index e04d238c5..794d5c232 100644
--- a/src/input/frontend/qlogicaldevice_p.h
+++ b/src/input/frontend/qlogicaldevice_p.h
@@ -68,14 +68,14 @@ public:
     QLogicalDevicePrivate();
     ~QLogicalDevicePrivate();
 
-    QVector<QAction *> m_actions;
-    QVector<QAxis *> m_axes;
+    QList<QAction *> m_actions;
+    QList<QAxis *> m_axes;
 };
 
 struct QLogicalDeviceData
 {
-    QVector<Qt3DCore::QNodeId> actionIds;
-    QVector<Qt3DCore::QNodeId> axisIds;
+    QList<Qt3DCore::QNodeId> actionIds;
+    QList<Qt3DCore::QNodeId> axisIds;
 };
 
 } // namespace Qt3DInput
-- 
cgit v1.2.3