Use QList instead of QVector

Task-number: QTBUG-84469
Change-Id: I3a3cd127fb9fed7b25d543a9c5af75c734397806
Reviewed-by: André Hartmann <aha_1980@gmx.de>

13 files changed, 21 insertions, 26 deletions

diff --git a/src/plugins/canbus/passthrucan/main.cpp b/src/plugins/canbus/passthrucan/main.cpp
index 5017597..10149af 100644
--- a/src/plugins/canbus/passthrucan/main.cpp
+++ b/src/plugins/canbus/passthrucan/main.cpp
@@ -52,7 +52,7 @@ public:
     PassThruCanBusPlugin()
     {
         qRegisterMetaType<QCanBusDevice::CanBusError>();
-        qRegisterMetaType<QVector<QCanBusFrame>>();
+        qRegisterMetaType<QList<QCanBusFrame>>();
     }
 
     QList<QCanBusDeviceInfo> availableDevices(QString *) const override
diff --git a/src/plugins/canbus/passthrucan/passthrucanbackend.h b/src/plugins/canbus/passthrucan/passthrucanbackend.h
index 864d1b4..2cbf998 100644
--- a/src/plugins/canbus/passthrucan/passthrucanbackend.h
+++ b/src/plugins/canbus/passthrucan/passthrucanbackend.h
@@ -40,9 +40,9 @@
 #include <QtSerialBus/qcanbusdevice.h>
 #include <QtSerialBus/qcanbusframe.h>
 
+#include <QList>
 #include <QString>
 #include <QThread>
-#include <QVector>
 
 QT_BEGIN_NAMESPACE
 
@@ -79,6 +79,6 @@ private:
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QCanBusDevice::CanBusError)
-Q_DECLARE_METATYPE(QVector<QCanBusFrame>)
+Q_DECLARE_METATYPE(QList<QCanBusFrame>)
 
 #endif // PASSTHRUCAN_PASSTHRUCANBACKEND_H
diff --git a/src/plugins/canbus/passthrucan/passthrucanio.cpp b/src/plugins/canbus/passthrucan/passthrucanio.cpp
index dc3d2c7..43cfc21 100644
--- a/src/plugins/canbus/passthrucan/passthrucanio.cpp
+++ b/src/plugins/canbus/passthrucan/passthrucanio.cpp
@@ -287,7 +287,7 @@ void PassThruCanIO::readMessages(bool writePending)
             return;
     }
     const int numFrames = qMin<ulong>(m_ioBuffer.size(), numMsgs);
-    QVector<QCanBusFrame> frames;
+    QList<QCanBusFrame> frames;
     frames.reserve(numFrames);
 
     for (int i = 0; i < numFrames; ++i) {
diff --git a/src/plugins/canbus/passthrucan/passthrucanio.h b/src/plugins/canbus/passthrucan/passthrucanio.h
index 071174c..0ed7f42 100644
--- a/src/plugins/canbus/passthrucan/passthrucanio.h
+++ b/src/plugins/canbus/passthrucan/passthrucanio.h
@@ -48,7 +48,6 @@
 #include <QString>
 #include <QTimer>
 #include <QVariant>
-#include <QVector>
 
 QT_BEGIN_NAMESPACE
 
@@ -72,7 +71,7 @@ public:
 
 Q_SIGNALS:
     void errorOccurred(const QString &description, QCanBusDevice::CanBusError error);
-    void messagesReceived(QVector<QCanBusFrame> frames);
+    void messagesReceived(QList<QCanBusFrame> frames);
     void messagesSent(qint64 count);
     void openFinished(bool success);
     void closeFinished();
@@ -88,7 +87,7 @@ private:
     J2534::PassThru::Handle m_deviceId      = 0;
     J2534::PassThru::Handle m_channelId     = 0;
     QTimer *                m_idleNotifier  = nullptr;
-    QVector<J2534::Message> m_ioBuffer;
+    QList<J2534::Message> m_ioBuffer;
     QMutex                  m_writeGuard;
     QList<QCanBusFrame>     m_writeQueue;
 };
diff --git a/src/plugins/canbus/peakcan/peakcanbackend.cpp b/src/plugins/canbus/peakcan/peakcanbackend.cpp
index 0b4cf5b..1f9afab 100644
--- a/src/plugins/canbus/peakcan/peakcanbackend.cpp
+++ b/src/plugins/canbus/peakcan/peakcanbackend.cpp
@@ -689,7 +689,7 @@ void PeakCanBackendPrivate::startRead()
 {
     Q_Q(PeakCanBackend);
 
-    QVector<QCanBusFrame> newFrames;
+    QList<QCanBusFrame> newFrames;
 
     for (;;) {
         if (isFlexibleDatarateEnabled) {
diff --git a/src/plugins/canbus/peakcan/peakcanbackend.h b/src/plugins/canbus/peakcan/peakcanbackend.h
index 0ee74c3..df76e5c 100644
--- a/src/plugins/canbus/peakcan/peakcanbackend.h
+++ b/src/plugins/canbus/peakcan/peakcanbackend.h
@@ -38,13 +38,12 @@
 #ifndef PEAKCANBACKEND_H
 #define PEAKCANBACKEND_H
 
-#include <QtSerialBus/qcanbusframe.h>
 #include <QtSerialBus/qcanbusdevice.h>
 #include <QtSerialBus/qcanbusdeviceinfo.h>
+#include <QtSerialBus/qcanbusframe.h>
 
-#include <QtCore/qvariant.h>
-#include <QtCore/qvector.h>
 #include <QtCore/qlist.h>
+#include <QtCore/qvariant.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp
index 572fef8..2470a34 100644
--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
+++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
@@ -284,7 +284,7 @@ bool SocketCanBackend::applyConfigurationParameter(int key, const QVariant &valu
             break;
         }
 
-        QVector<can_filter> filters;
+        QList<can_filter> filters;
         filters.resize(filterList.size());
         for (int i = 0; i < filterList.size(); i++) {
             const QCanBusDevice::Filter f = filterList.at(i);
@@ -457,7 +457,7 @@ void SocketCanBackend::setConfigurationParameter(int key, const QVariant &value)
 
     QCanBusDevice::setConfigurationParameter(key, value);
 
-    // we need to check CAN FD option a lot -> cache it and avoid QVector lookup
+    // we need to check CAN FD option a lot -> cache it and avoid QList lookup
     if (key == QCanBusDevice::CanFdKey)
         canFdOptionEnabled = value.toBool();
 }
@@ -685,7 +685,7 @@ QString SocketCanBackend::interpretErrorFrame(const QCanBusFrame &errorFrame)
 
 void SocketCanBackend::readSocket()
 {
-    QVector<QCanBusFrame> newFrames;
+    QList<QCanBusFrame> newFrames;
 
     for (;;) {
         m_frame = {};
diff --git a/src/plugins/canbus/systeccan/systeccanbackend.cpp b/src/plugins/canbus/systeccan/systeccanbackend.cpp
index e5bb09b..06df8e9 100644
--- a/src/plugins/canbus/systeccan/systeccanbackend.cpp
+++ b/src/plugins/canbus/systeccan/systeccanbackend.cpp
@@ -398,7 +398,7 @@ void SystecCanBackendPrivate::readAllReceivedMessages()
 {
     Q_Q(SystecCanBackend);
 
-    QVector<QCanBusFrame> newFrames;
+    QList<QCanBusFrame> newFrames;
 
     for (;;) {
         tCanMsgStruct message = {};
@@ -517,7 +517,7 @@ bool SystecCanBackend::open()
 
     // Apply all stored configurations except bitrate and receive own,
     // because these cannot be applied after opening the device
-    const QVector<int> keys = configurationKeys();
+    const QList<int> keys = configurationKeys();
     for (int key : keys) {
         if (key == BitRateKey || key == ReceiveOwnKey)
             continue;
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp
index 62da66d..98ffbf1 100644
--- a/src/plugins/canbus/tinycan/tinycanbackend.cpp
+++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp
@@ -382,7 +382,7 @@ void TinyCanBackendPrivate::startRead()
 {
     Q_Q(TinyCanBackend);
 
-    QVector<QCanBusFrame> newFrames;
+    QList<QCanBusFrame> newFrames;
 
     for (;;) {
         if (!::CanReceiveGetCount(channelIndex))
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.h b/src/plugins/canbus/tinycan/tinycanbackend.h
index 428e9bc..294778b 100644
--- a/src/plugins/canbus/tinycan/tinycanbackend.h
+++ b/src/plugins/canbus/tinycan/tinycanbackend.h
@@ -38,13 +38,12 @@
 #ifndef TINYCANBACKEND_H
 #define TINYCANBACKEND_H
 
-#include <QtSerialBus/qcanbusframe.h>
 #include <QtSerialBus/qcanbusdevice.h>
 #include <QtSerialBus/qcanbusdeviceinfo.h>
+#include <QtSerialBus/qcanbusframe.h>
 
-#include <QtCore/qvariant.h>
-#include <QtCore/qvector.h>
 #include <QtCore/qlist.h>
+#include <QtCore/qvariant.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp
index 5d719d8..1e15ec8 100644
--- a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp
+++ b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp
@@ -399,7 +399,7 @@ void VectorCanBackendPrivate::startRead()
 {
     Q_Q(VectorCanBackend);
 
-    QVector<QCanBusFrame> newFrames;
+    QList<QCanBusFrame> newFrames;
 
     for (;;) {
         quint32 eventCount = 1;
diff --git a/src/plugins/canbus/vectorcan/vectorcanbackend.h b/src/plugins/canbus/vectorcan/vectorcanbackend.h
index 89b9da6..e90e595 100644
--- a/src/plugins/canbus/vectorcan/vectorcanbackend.h
+++ b/src/plugins/canbus/vectorcan/vectorcanbackend.h
@@ -37,13 +37,12 @@
 #ifndef VECTORCANBACKEND_H
 #define VECTORCANBACKEND_H
 
-#include <QtSerialBus/qcanbusframe.h>
 #include <QtSerialBus/qcanbusdevice.h>
 #include <QtSerialBus/qcanbusdeviceinfo.h>
+#include <QtSerialBus/qcanbusframe.h>
 
-#include <QtCore/qvariant.h>
-#include <QtCore/qvector.h>
 #include <QtCore/qlist.h>
+#include <QtCore/qvariant.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/canbus/virtualcan/virtualcanbackend.h b/src/plugins/canbus/virtualcan/virtualcanbackend.h
index c83b568..38f79da 100644
--- a/src/plugins/canbus/virtualcan/virtualcanbackend.h
+++ b/src/plugins/canbus/virtualcan/virtualcanbackend.h
@@ -37,14 +37,13 @@
 #ifndef VIRTUALCANBACKEND_H
 #define VIRTUALCANBACKEND_H
 
-#include <QtSerialBus/qcanbusframe.h>
 #include <QtSerialBus/qcanbusdevice.h>
 #include <QtSerialBus/qcanbusdeviceinfo.h>
+#include <QtSerialBus/qcanbusframe.h>
 
 #include <QtCore/qlist.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qvariant.h>
-#include <QtCore/qvector.h>
 
 QT_BEGIN_NAMESPACE