From ced37650052b3ce6654fa40bd8e2d817c1418feb Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Wed, 24 Jun 2020 16:44:53 +0200
Subject: Use QList instead of QVector

Task-number: QTBUG-84469
Change-Id: I4ef3c22412f5978b3474c0ccd90bae08fd7f1297
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
---
 src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp  | 5 +++--
 src/plugins/sensors/sensorfw/sensorfwaccelerometer.h    | 4 ++--
 src/plugins/sensors/sensorfw/sensorfwgyroscope.cpp      | 5 +++--
 src/plugins/sensors/sensorfw/sensorfwgyroscope.h        | 5 ++---
 src/plugins/sensors/sensorfw/sensorfwmagnetometer.cpp   | 7 +++----
 src/plugins/sensors/sensorfw/sensorfwmagnetometer.h     | 5 ++---
 src/plugins/sensors/sensorfw/sensorfwrotationsensor.cpp | 5 +++--
 src/plugins/sensors/sensorfw/sensorfwrotationsensor.h   | 3 +--
 src/sensors/gestures/qsensorgesture.h                   | 1 -
 9 files changed, 19 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp
index a1e9840a..28152633 100644
--- a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp
+++ b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp
@@ -63,7 +63,7 @@ void sensorfwaccelerometer::slotDataAvailable(const XYZ& data)
     newReadingAvailable();
 }
 
-void sensorfwaccelerometer::slotFrameAvailable(const QVector<XYZ>&  frame)
+void sensorfwaccelerometer::slotFrameAvailable(const QList<XYZ> &frame)
 {
     for (int i=0, l=frame.size(); i<l; i++) {
         slotDataAvailable(frame.at(i));
@@ -75,7 +75,8 @@ bool sensorfwaccelerometer::doConnect()
     Q_ASSERT(m_sensorInterface);
     if (m_bufferSize==1)
         return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(XYZ)), this, SLOT(slotDataAvailable(XYZ)));
-    return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(QVector<XYZ>)),this, SLOT(slotFrameAvailable(QVector<XYZ>)));
+    return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(QList<XYZ>)), this,
+                            SLOT(slotFrameAvailable(QList<XYZ>)));
 }
 
 
diff --git a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h
index 89d7bf78..036d3c1a 100644
--- a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h
+++ b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.h
@@ -66,8 +66,8 @@ private:
     bool m_initDone;
 
 private slots:
-    void slotDataAvailable(const XYZ& data);
-    void slotFrameAvailable(const QVector<XYZ>&);
+    void slotDataAvailable(const XYZ &data);
+    void slotFrameAvailable(const QList<XYZ> &);
 };
 
 #endif
diff --git a/src/plugins/sensors/sensorfw/sensorfwgyroscope.cpp b/src/plugins/sensors/sensorfw/sensorfwgyroscope.cpp
index cc9c169e..8c516f3b 100644
--- a/src/plugins/sensors/sensorfw/sensorfwgyroscope.cpp
+++ b/src/plugins/sensors/sensorfw/sensorfwgyroscope.cpp
@@ -64,7 +64,7 @@ void SensorfwGyroscope::slotDataAvailable(const XYZ& data)
     newReadingAvailable();
 }
 
-void SensorfwGyroscope::slotFrameAvailable(const QVector<XYZ>&  frame)
+void SensorfwGyroscope::slotFrameAvailable(const QList<XYZ> &frame)
 {
     for (int i=0, l=frame.size(); i<l; i++) {
         slotDataAvailable(frame.at(i));
@@ -76,7 +76,8 @@ bool SensorfwGyroscope::doConnect()
     Q_ASSERT(m_sensorInterface);
     if (m_bufferSize==1)
         return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(XYZ)), this, SLOT(slotDataAvailable(XYZ)));
-    return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(QVector<XYZ>)),this, SLOT(slotFrameAvailable(QVector<XYZ>)));
+    return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(QList<XYZ>)), this,
+                            SLOT(slotFrameAvailable(QList<XYZ>)));
 }
 
 QString SensorfwGyroscope::sensorName() const
diff --git a/src/plugins/sensors/sensorfw/sensorfwgyroscope.h b/src/plugins/sensors/sensorfw/sensorfwgyroscope.h
index d9346a94..6b685a1d 100644
--- a/src/plugins/sensors/sensorfw/sensorfwgyroscope.h
+++ b/src/plugins/sensors/sensorfw/sensorfwgyroscope.h
@@ -68,9 +68,8 @@ private:
     bool m_initDone;
     static const float MILLI;
 private slots:
-    void slotDataAvailable(const XYZ& data);
-    void slotFrameAvailable(const QVector<XYZ>&);
-
+    void slotDataAvailable(const XYZ &data);
+    void slotFrameAvailable(const QList<XYZ> &);
 };
 
 
diff --git a/src/plugins/sensors/sensorfw/sensorfwmagnetometer.cpp b/src/plugins/sensors/sensorfw/sensorfwmagnetometer.cpp
index 084e6eac..517e1fe8 100644
--- a/src/plugins/sensors/sensorfw/sensorfwmagnetometer.cpp
+++ b/src/plugins/sensors/sensorfw/sensorfwmagnetometer.cpp
@@ -76,8 +76,7 @@ void SensorfwMagnetometer::slotDataAvailable(const MagneticField& data)
     newReadingAvailable();
 }
 
-
-void SensorfwMagnetometer::slotFrameAvailable(const QVector<MagneticField>& frame)
+void SensorfwMagnetometer::slotFrameAvailable(const QList<MagneticField> &frame)
 {
     for (int i=0, l=frame.size(); i<l; i++) {
         slotDataAvailable(frame.at(i));
@@ -90,8 +89,8 @@ bool SensorfwMagnetometer::doConnect()
     if (m_bufferSize==1)
         return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(MagneticField)),
                                 this, SLOT(slotDataAvailable(MagneticField)));
-     return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(QVector<MagneticField>)),
-                             this, SLOT(slotFrameAvailable(QVector<MagneticField>)));
+    return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(QList<MagneticField>)), this,
+                            SLOT(slotFrameAvailable(QList<MagneticField>)));
 }
 
 QString SensorfwMagnetometer::sensorName() const
diff --git a/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h b/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h
index 03f29556..26a08108 100644
--- a/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h
+++ b/src/plugins/sensors/sensorfw/sensorfwmagnetometer.h
@@ -69,9 +69,8 @@ private:
     bool m_isGeoMagnetometer;
 
 private slots:
-    void slotDataAvailable(const MagneticField& data);
-    void slotFrameAvailable(const QVector<MagneticField>&);
-
+    void slotDataAvailable(const MagneticField &data);
+    void slotFrameAvailable(const QList<MagneticField> &);
 };
 
 #endif
diff --git a/src/plugins/sensors/sensorfw/sensorfwrotationsensor.cpp b/src/plugins/sensors/sensorfw/sensorfwrotationsensor.cpp
index d884c538..fa36f76f 100644
--- a/src/plugins/sensors/sensorfw/sensorfwrotationsensor.cpp
+++ b/src/plugins/sensors/sensorfw/sensorfwrotationsensor.cpp
@@ -60,7 +60,7 @@ void SensorfwRotationSensor::slotDataAvailable(const XYZ& data)
     newReadingAvailable();
 }
 
-void SensorfwRotationSensor::slotFrameAvailable(const QVector<XYZ>&  frame)
+void SensorfwRotationSensor::slotFrameAvailable(const QList<XYZ> &frame)
 {
     for (int i=0, l=frame.size(); i<l; i++) {
         slotDataAvailable(frame.at(i));
@@ -72,7 +72,8 @@ bool SensorfwRotationSensor::doConnect()
     Q_ASSERT(m_sensorInterface);
     if (m_bufferSize==1)
        return QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(XYZ)), this, SLOT(slotDataAvailable(XYZ)));
-    return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(QVector<XYZ>)),this, SLOT(slotFrameAvailable(QVector<XYZ>)));
+    return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(QList<XYZ>)), this,
+                            SLOT(slotFrameAvailable(QList<XYZ>)));
 }
 
 QString SensorfwRotationSensor::sensorName() const
diff --git a/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h b/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h
index f9150f6d..9723922b 100644
--- a/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h
+++ b/src/plugins/sensors/sensorfw/sensorfwrotationsensor.h
@@ -67,8 +67,7 @@ private:
 
 private slots:
     void slotDataAvailable(const XYZ& data);
-    void slotFrameAvailable(const QVector<XYZ>&);
-
+    void slotFrameAvailable(const QList<XYZ> &);
 };
 
 #endif
diff --git a/src/sensors/gestures/qsensorgesture.h b/src/sensors/gestures/qsensorgesture.h
index 53de7630..3c593be7 100644
--- a/src/sensors/gestures/qsensorgesture.h
+++ b/src/sensors/gestures/qsensorgesture.h
@@ -46,7 +46,6 @@
 
 #include <QtCore/QList>
 #include <QtCore/QMap>
-#include <QtCore/QVector>
 
 #include <QtCore/qmetatype.h>
 
-- 
cgit v1.2.3