summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-06-24 16:44:53 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-06-25 10:06:33 +0200
commitced37650052b3ce6654fa40bd8e2d817c1418feb (patch)
tree11adca04c143226858e20c6a3a186fc684d378fd
parentbb04cf3071975c748fb6d34f64e7151d8ea8417d (diff)
downloadqtsensors-ced37650052b3ce6654fa40bd8e2d817c1418feb.tar.gz
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>
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp5
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwaccelerometer.h4
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwgyroscope.cpp5
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwgyroscope.h5
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwmagnetometer.cpp7
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwmagnetometer.h5
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwrotationsensor.cpp5
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwrotationsensor.h3
-rw-r--r--src/sensors/gestures/qsensorgesture.h1
9 files changed, 19 insertions, 21 deletions
diff --git a/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp b/src/plugins/sensors/sensorfw/sensorfwaccelerometer.cpp
index a1e9840..2815263 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 89d7bf7..036d3c1 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 cc9c169..8c516f3 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 d9346a9..6b685a1 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 084e6ea..517e1fe 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 03f2955..26a0810 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 d884c53..fa36f76 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 f9150f6..9723922 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 53de763..3c593be 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>