summaryrefslogtreecommitdiffstats
path: root/src/input
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-07-07 14:02:36 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-07-07 19:32:07 +0200
commit8a59b2ebf081af5bb9698281420d0ce59405712d (patch)
tree354f5ca9f897667c8ee9b0765c32a1f2daabcd92 /src/input
parent858e0ce0ef39e3094e09c19fa27a896be4abfe74 (diff)
Use QList instead of QVector
Task-number: QTBUG-84469 Change-Id: Ic726ce85e01190dbc64426388fd454c54ae3c3e3 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/input')
-rw-r--r--src/input/frontend/qabstractphysicaldevice.cpp2
-rw-r--r--src/input/frontend/qabstractphysicaldevice.h4
-rw-r--r--src/input/frontend/qaction.cpp2
-rw-r--r--src/input/frontend/qaction.h2
-rw-r--r--src/input/frontend/qactioninput.cpp8
-rw-r--r--src/input/frontend/qactioninput.h8
-rw-r--r--src/input/frontend/qaxis.cpp2
-rw-r--r--src/input/frontend/qaxis.h2
-rw-r--r--src/input/frontend/qaxissetting.cpp6
-rw-r--r--src/input/frontend/qaxissetting.h10
-rw-r--r--src/input/frontend/qbuttonaxisinput.cpp4
-rw-r--r--src/input/frontend/qbuttonaxisinput.h8
-rw-r--r--src/input/frontend/qinputchord.cpp2
-rw-r--r--src/input/frontend/qinputchord.h2
-rw-r--r--src/input/frontend/qinputsequence.cpp2
-rw-r--r--src/input/frontend/qinputsequence.h2
-rw-r--r--src/input/frontend/qlogicaldevice.cpp4
-rw-r--r--src/input/frontend/qlogicaldevice.h4
18 files changed, 37 insertions, 37 deletions
diff --git a/src/input/frontend/qabstractphysicaldevice.cpp b/src/input/frontend/qabstractphysicaldevice.cpp
index 100852d2a..3a7eaf0dd 100644
--- a/src/input/frontend/qabstractphysicaldevice.cpp
+++ b/src/input/frontend/qabstractphysicaldevice.cpp
@@ -184,7 +184,7 @@ void QAbstractPhysicalDevice::removeAxisSetting(QAxisSetting *axisSetting)
/*!
Returns the axisSettings associated with this device.
*/
-QVector<QAxisSetting *> QAbstractPhysicalDevice::axisSettings() const
+QList<QAxisSetting *> QAbstractPhysicalDevice::axisSettings() const
{
Q_D(const QAbstractPhysicalDevice);
return d->m_axisSettings;
diff --git a/src/input/frontend/qabstractphysicaldevice.h b/src/input/frontend/qabstractphysicaldevice.h
index 3161443ae..501b4851c 100644
--- a/src/input/frontend/qabstractphysicaldevice.h
+++ b/src/input/frontend/qabstractphysicaldevice.h
@@ -42,8 +42,8 @@
#include <Qt3DInput/qt3dinput_global.h>
#include <Qt3DCore/qnode.h>
+#include <QtCore/qlist.h>
#include <QtCore/qobject.h>
-#include <QtCore/qvector.h>
QT_BEGIN_NAMESPACE
@@ -70,7 +70,7 @@ public:
void addAxisSetting(QAxisSetting *axisSetting);
void removeAxisSetting(QAxisSetting *axisSetting);
- QVector<QAxisSetting *> axisSettings() const;
+ QList<QAxisSetting *> axisSettings() const;
protected:
QAbstractPhysicalDevice(QAbstractPhysicalDevicePrivate &dd, Qt3DCore::QNode *parent = nullptr);
diff --git a/src/input/frontend/qaction.cpp b/src/input/frontend/qaction.cpp
index c13aaa6bd..51f375fb5 100644
--- a/src/input/frontend/qaction.cpp
+++ b/src/input/frontend/qaction.cpp
@@ -141,7 +141,7 @@ void QAction::removeInput(QAbstractActionInput *input)
/*!
Returns the list of inputs that can trigger this action.
*/
-QVector<QAbstractActionInput *> QAction::inputs() const
+QList<QAbstractActionInput *> QAction::inputs() const
{
Q_D(const QAction);
return d->m_inputs;
diff --git a/src/input/frontend/qaction.h b/src/input/frontend/qaction.h
index 63a9c7033..707283b30 100644
--- a/src/input/frontend/qaction.h
+++ b/src/input/frontend/qaction.h
@@ -62,7 +62,7 @@ public:
void addInput(QAbstractActionInput *input);
void removeInput(QAbstractActionInput *input);
- QVector<QAbstractActionInput *> inputs() const;
+ QList<QAbstractActionInput *> inputs() const;
Q_SIGNALS:
void activeChanged(bool isActive);
diff --git a/src/input/frontend/qactioninput.cpp b/src/input/frontend/qactioninput.cpp
index 42db5d28f..1b4834d7f 100644
--- a/src/input/frontend/qactioninput.cpp
+++ b/src/input/frontend/qactioninput.cpp
@@ -105,7 +105,7 @@ QActionInput::~QActionInput()
Holds the buttons that can trigger this Action.
*/
-QVector<int> QActionInput::buttons() const
+QList<int> QActionInput::buttons() const
{
Q_D(const QActionInput);
return d->m_buttons;
@@ -165,7 +165,7 @@ QAbstractPhysicalDevice *QActionInput::sourceDevice() const
}
/*!
- \fn Qt3DInput::QActionInput::buttonsChanged(const QVector<int> &buttons)
+ \fn Qt3DInput::QActionInput::buttonsChanged(const QList<int> &buttons)
This signal is emitted when the buttons associated with the action input is changed.
The buttons changed are \a buttons
@@ -178,7 +178,7 @@ QAbstractPhysicalDevice *QActionInput::sourceDevice() const
*/
/*!
- \qmlsignal Qt3D.Input::ActionInput::buttonsChanged(const QVector<int> &buttons)
+ \qmlsignal Qt3D.Input::ActionInput::buttonsChanged(const QList<int> &buttons)
This signal is emitted when the \a buttons associated with the action input is changed.
@@ -188,7 +188,7 @@ QAbstractPhysicalDevice *QActionInput::sourceDevice() const
/*!
Set the buttons to trigger the QActionInput instance to \a buttons.
*/
-void QActionInput::setButtons(const QVector<int> &buttons)
+void QActionInput::setButtons(const QList<int> &buttons)
{
Q_D(QActionInput);
if (buttons != d->m_buttons) {
diff --git a/src/input/frontend/qactioninput.h b/src/input/frontend/qactioninput.h
index 86dfcb282..fbf899e26 100644
--- a/src/input/frontend/qactioninput.h
+++ b/src/input/frontend/qactioninput.h
@@ -55,22 +55,22 @@ class Q_3DINPUTSHARED_EXPORT QActionInput : public Qt3DInput::QAbstractActionInp
{
Q_OBJECT
Q_PROPERTY(Qt3DInput::QAbstractPhysicalDevice *sourceDevice READ sourceDevice WRITE setSourceDevice NOTIFY sourceDeviceChanged)
- Q_PROPERTY(QVector<int> buttons READ buttons WRITE setButtons NOTIFY buttonsChanged)
+ Q_PROPERTY(QList<int> buttons READ buttons WRITE setButtons NOTIFY buttonsChanged)
public:
explicit QActionInput(Qt3DCore::QNode *parent = nullptr);
~QActionInput();
QAbstractPhysicalDevice *sourceDevice() const;
- QVector<int> buttons() const;
+ QList<int> buttons() const;
public Q_SLOTS:
void setSourceDevice(QAbstractPhysicalDevice *sourceDevice);
- void setButtons(const QVector<int> &buttons);
+ void setButtons(const QList<int> &buttons);
Q_SIGNALS:
void sourceDeviceChanged(QAbstractPhysicalDevice *sourceDevice);
- void buttonsChanged(const QVector<int> &buttons);
+ void buttonsChanged(const QList<int> &buttons);
private:
Q_DECLARE_PRIVATE(QActionInput)
diff --git a/src/input/frontend/qaxis.cpp b/src/input/frontend/qaxis.cpp
index d41cf904f..d19b0f08e 100644
--- a/src/input/frontend/qaxis.cpp
+++ b/src/input/frontend/qaxis.cpp
@@ -149,7 +149,7 @@ void QAxis::removeInput(QAbstractAxisInput *input)
\return vector of all inputs added to the axis.
*/
-QVector<QAbstractAxisInput *> QAxis::inputs() const
+QList<QAbstractAxisInput *> QAxis::inputs() const
{
Q_D(const QAxis);
return d->m_inputs;
diff --git a/src/input/frontend/qaxis.h b/src/input/frontend/qaxis.h
index 4482dbedc..3dcb68692 100644
--- a/src/input/frontend/qaxis.h
+++ b/src/input/frontend/qaxis.h
@@ -59,7 +59,7 @@ public:
void addInput(QAbstractAxisInput *input);
void removeInput(QAbstractAxisInput *input);
- QVector<QAbstractAxisInput *> inputs() const;
+ QList<QAbstractAxisInput *> inputs() const;
float value() const;
diff --git a/src/input/frontend/qaxissetting.cpp b/src/input/frontend/qaxissetting.cpp
index d5ea709f6..70f8120b7 100644
--- a/src/input/frontend/qaxissetting.cpp
+++ b/src/input/frontend/qaxissetting.cpp
@@ -90,7 +90,7 @@ QAxisSetting::~QAxisSetting()
* \brief QAxisSetting::axes
* \return the current list of Axis these settings apply to.
*/
-QVector<int> QAxisSetting::axes() const
+QList<int> QAxisSetting::axes() const
{
Q_D(const QAxisSetting);
return d->m_axes;
@@ -159,7 +159,7 @@ void QAxisSetting::setDeadZoneRadius(float deadZoneRadius)
}
/*!
- \fn Qt3DInput::QAxisSetting::axesChanged(const QVector<int> &axes)
+ \fn Qt3DInput::QAxisSetting::axesChanged(const QList<int> &axes)
This signal is emitted when the axes associated with the axis setting is changed to \a axes.
*/
@@ -181,7 +181,7 @@ void QAxisSetting::setDeadZoneRadius(float deadZoneRadius)
/*!
Set the current axes of the QAxisSetting instance to \a axes.
*/
-void QAxisSetting::setAxes(const QVector<int> &axes)
+void QAxisSetting::setAxes(const QList<int> &axes)
{
Q_D(QAxisSetting);
if (d->m_axes == axes)
diff --git a/src/input/frontend/qaxissetting.h b/src/input/frontend/qaxissetting.h
index 5f814cf8a..b7ec7b7da 100644
--- a/src/input/frontend/qaxissetting.h
+++ b/src/input/frontend/qaxissetting.h
@@ -42,7 +42,7 @@
#include <Qt3DInput/qt3dinput_global.h>
#include <Qt3DCore/qnode.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
QT_BEGIN_NAMESPACE
@@ -54,7 +54,7 @@ class Q_3DINPUTSHARED_EXPORT QAxisSetting : public Qt3DCore::QNode
{
Q_OBJECT
Q_PROPERTY(float deadZoneRadius READ deadZoneRadius WRITE setDeadZoneRadius NOTIFY deadZoneRadiusChanged)
- Q_PROPERTY(QVector<int> axes READ axes WRITE setAxes NOTIFY axesChanged)
+ Q_PROPERTY(QList<int> axes READ axes WRITE setAxes NOTIFY axesChanged)
Q_PROPERTY(bool smooth READ isSmoothEnabled WRITE setSmoothEnabled NOTIFY smoothChanged)
public:
@@ -62,17 +62,17 @@ public:
~QAxisSetting();
float deadZoneRadius() const;
- QVector<int> axes() const;
+ QList<int> axes() const;
bool isSmoothEnabled() const;
public Q_SLOTS:
void setDeadZoneRadius(float deadZoneRadius);
- void setAxes(const QVector<int> &axes);
+ void setAxes(const QList<int> &axes);
void setSmoothEnabled(bool enabled);
Q_SIGNALS:
void deadZoneRadiusChanged(float deadZoneRadius);
- void axesChanged(const QVector<int> &axes);
+ void axesChanged(const QList<int> &axes);
void smoothChanged(bool smooth);
private:
diff --git a/src/input/frontend/qbuttonaxisinput.cpp b/src/input/frontend/qbuttonaxisinput.cpp
index 6cd997156..0149766f6 100644
--- a/src/input/frontend/qbuttonaxisinput.cpp
+++ b/src/input/frontend/qbuttonaxisinput.cpp
@@ -123,7 +123,7 @@ float QButtonAxisInput::scale() const
\property QButtonAxisInput::buttons
Specifies the buttons which control the axis
*/
-void QButtonAxisInput::setButtons(const QVector<int> &buttons)
+void QButtonAxisInput::setButtons(const QList<int> &buttons)
{
Q_D(QButtonAxisInput);
if (buttons != d->m_buttons) {
@@ -132,7 +132,7 @@ void QButtonAxisInput::setButtons(const QVector<int> &buttons)
}
}
-QVector<int> QButtonAxisInput::buttons() const
+QList<int> QButtonAxisInput::buttons() const
{
Q_D(const QButtonAxisInput);
return d->m_buttons;
diff --git a/src/input/frontend/qbuttonaxisinput.h b/src/input/frontend/qbuttonaxisinput.h
index e17b6d94e..2e3da532f 100644
--- a/src/input/frontend/qbuttonaxisinput.h
+++ b/src/input/frontend/qbuttonaxisinput.h
@@ -53,7 +53,7 @@ class Q_3DINPUTSHARED_EXPORT QButtonAxisInput : public QAbstractAxisInput
{
Q_OBJECT
Q_PROPERTY(float scale READ scale WRITE setScale NOTIFY scaleChanged)
- Q_PROPERTY(QVector<int> buttons READ buttons WRITE setButtons NOTIFY buttonsChanged)
+ Q_PROPERTY(QList<int> buttons READ buttons WRITE setButtons NOTIFY buttonsChanged)
Q_PROPERTY(float acceleration READ acceleration WRITE setAcceleration NOTIFY accelerationChanged)
Q_PROPERTY(float deceleration READ deceleration WRITE setDeceleration NOTIFY decelerationChanged)
@@ -62,21 +62,21 @@ public:
~QButtonAxisInput();
float scale() const;
- QVector<int> buttons() const;
+ QList<int> buttons() const;
float acceleration() const;
float deceleration() const;
public Q_SLOTS:
void setScale(float scale);
- void setButtons(const QVector<int> &buttons);
+ void setButtons(const QList<int> &buttons);
void setAcceleration(float acceleration);
void setDeceleration(float deceleration);
Q_SIGNALS:
void scaleChanged(float scale);
- void buttonsChanged(const QVector<int> &buttons);
+ void buttonsChanged(const QList<int> &buttons);
void accelerationChanged(float acceleration);
void decelerationChanged(float deceleration);
diff --git a/src/input/frontend/qinputchord.cpp b/src/input/frontend/qinputchord.cpp
index 474e25254..3e470f8bb 100644
--- a/src/input/frontend/qinputchord.cpp
+++ b/src/input/frontend/qinputchord.cpp
@@ -178,7 +178,7 @@ void QInputChord::removeChord(QAbstractActionInput *input)
/*!
Returns the QInputChord's chord vector.
*/
-QVector<QAbstractActionInput *> QInputChord::chords() const
+QList<QAbstractActionInput *> QInputChord::chords() const
{
Q_D(const QInputChord);
return d->m_chords;
diff --git a/src/input/frontend/qinputchord.h b/src/input/frontend/qinputchord.h
index fd917c745..1960d949d 100644
--- a/src/input/frontend/qinputchord.h
+++ b/src/input/frontend/qinputchord.h
@@ -64,7 +64,7 @@ public:
void addChord(QAbstractActionInput *input);
void removeChord(QAbstractActionInput *input);
- QVector<QAbstractActionInput *> chords() const;
+ QList<QAbstractActionInput *> chords() const;
public Q_SLOTS:
void setTimeout(int timeout);
diff --git a/src/input/frontend/qinputsequence.cpp b/src/input/frontend/qinputsequence.cpp
index ba571bbb9..7fa701749 100644
--- a/src/input/frontend/qinputsequence.cpp
+++ b/src/input/frontend/qinputsequence.cpp
@@ -231,7 +231,7 @@ void QInputSequence::removeSequence(QAbstractActionInput *input)
/*!
Returns the QInputSequence's sequence vector.
*/
-QVector<QAbstractActionInput *> QInputSequence::sequences() const
+QList<QAbstractActionInput *> QInputSequence::sequences() const
{
Q_D(const QInputSequence);
return d->m_sequences;
diff --git a/src/input/frontend/qinputsequence.h b/src/input/frontend/qinputsequence.h
index 47e4aa488..f732e169f 100644
--- a/src/input/frontend/qinputsequence.h
+++ b/src/input/frontend/qinputsequence.h
@@ -66,7 +66,7 @@ public:
void addSequence(QAbstractActionInput *input);
void removeSequence(QAbstractActionInput *input);
- QVector<QAbstractActionInput *> sequences() const;
+ QList<QAbstractActionInput *> sequences() const;
public Q_SLOTS:
void setTimeout(int timeout);
diff --git a/src/input/frontend/qlogicaldevice.cpp b/src/input/frontend/qlogicaldevice.cpp
index cf723f9aa..eb1eaf350 100644
--- a/src/input/frontend/qlogicaldevice.cpp
+++ b/src/input/frontend/qlogicaldevice.cpp
@@ -195,7 +195,7 @@ void QLogicalDevice::removeAction(QAction *action)
/*!
Returns the list of actions.
*/
-QVector<QAction *> QLogicalDevice::actions() const
+QList<QAction *> QLogicalDevice::actions() const
{
Q_D(const QLogicalDevice);
return d->m_actions;
@@ -246,7 +246,7 @@ void QLogicalDevice::removeAxis(QAxis *axis)
/*!
Returns the list of axis.
*/
-QVector<QAxis *> QLogicalDevice::axes() const
+QList<QAxis *> QLogicalDevice::axes() const
{
Q_D(const QLogicalDevice);
return d->m_axes;
diff --git a/src/input/frontend/qlogicaldevice.h b/src/input/frontend/qlogicaldevice.h
index 5f8a08e6e..06fb9d279 100644
--- a/src/input/frontend/qlogicaldevice.h
+++ b/src/input/frontend/qlogicaldevice.h
@@ -60,11 +60,11 @@ public:
void addAction(QAction *action);
void removeAction(QAction *action);
- QVector<QAction *> actions() const;
+ QList<QAction *> actions() const;
void addAxis(QAxis *axis);
void removeAxis(QAxis *axis);
- QVector<QAxis *> axes() const;
+ QList<QAxis *> axes() const;
private:
Q_DECLARE_PRIVATE(QLogicalDevice)