Use QList instead of QVector

Task-number: QTBUG-84469
Change-Id: Id8d07836a66e4d9223341483bfe0ed251ba2806c
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>

4 files changed, 7 insertions, 9 deletions

diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp
index 7840eda31..961028024 100644
--- a/src/multimedia/video/qvideoframe.cpp
+++ b/src/multimedia/video/qvideoframe.cpp
@@ -44,11 +44,10 @@
 #include "qvideoframeconversionhelper_p.h"
 
 #include <qimage.h>
+#include <qmutex.h>
 #include <qpair.h>
 #include <qsize.h>
 #include <qvariant.h>
-#include <qvector.h>
-#include <qmutex.h>
 
 #include <QDebug>
 
diff --git a/src/multimedia/video/qvideosurfaceformat.cpp b/src/multimedia/video/qvideosurfaceformat.cpp
index 77ea276c7..400352b50 100644
--- a/src/multimedia/video/qvideosurfaceformat.cpp
+++ b/src/multimedia/video/qvideosurfaceformat.cpp
@@ -40,10 +40,10 @@
 #include "qvideosurfaceformat.h"
 
 #include <qdebug.h>
+#include <qlist.h>
 #include <qmetatype.h>
 #include <qpair.h>
 #include <qvariant.h>
-#include <qvector.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/video/qvideosurfaces.cpp b/src/multimedia/video/qvideosurfaces.cpp
index 793879382..7ce1bd932 100644
--- a/src/multimedia/video/qvideosurfaces.cpp
+++ b/src/multimedia/video/qvideosurfaces.cpp
@@ -41,9 +41,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QVideoSurfaces::QVideoSurfaces(const QVector<QAbstractVideoSurface *> &s, QObject *parent)
-    : QAbstractVideoSurface(parent)
-    , m_surfaces(s)
+QVideoSurfaces::QVideoSurfaces(const QList<QAbstractVideoSurface *> &s, QObject *parent)
+    : QAbstractVideoSurface(parent), m_surfaces(s)
 {
     for (auto a : s) {
         connect(a, &QAbstractVideoSurface::supportedFormatsChanged, this, [this, a] {
diff --git a/src/multimedia/video/qvideosurfaces_p.h b/src/multimedia/video/qvideosurfaces_p.h
index 67831e74e..9074ba458 100644
--- a/src/multimedia/video/qvideosurfaces_p.h
+++ b/src/multimedia/video/qvideosurfaces_p.h
@@ -52,14 +52,14 @@
 //
 
 #include <QAbstractVideoSurface>
-#include <QVector>
+#include <QList>
 
 QT_BEGIN_NAMESPACE
 
 class QVideoSurfaces : public QAbstractVideoSurface
 {
 public:
-    QVideoSurfaces(const QVector<QAbstractVideoSurface *> &surfaces, QObject *parent = nullptr);
+    QVideoSurfaces(const QList<QAbstractVideoSurface *> &surfaces, QObject *parent = nullptr);
     ~QVideoSurfaces();
 
     QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType type) const override;
@@ -68,7 +68,7 @@ public:
     bool present(const QVideoFrame &frame) override;
 
 private:
-    QVector<QAbstractVideoSurface *> m_surfaces;
+    QList<QAbstractVideoSurface *> m_surfaces;
     Q_DISABLE_COPY(QVideoSurfaces)
 };