From 1818334beafcf8668b30b8ee63031f871a0c8d03 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Wed, 24 Jun 2020 12:20:29 +0200
Subject: Use QList instead of QVector

Task-number: QTBUG-84469
Change-Id: Id8d07836a66e4d9223341483bfe0ed251ba2806c
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
---
 src/plugins/gstreamer/camerabin/camerabinfocus.cpp | 10 +++++-----
 src/plugins/gstreamer/camerabin/camerabinfocus.h   |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/plugins/gstreamer')

diff --git a/src/plugins/gstreamer/camerabin/camerabinfocus.cpp b/src/plugins/gstreamer/camerabin/camerabinfocus.cpp
index d4e7fa699..20d55d7d3 100644
--- a/src/plugins/gstreamer/camerabin/camerabinfocus.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinfocus.cpp
@@ -382,7 +382,7 @@ void CameraBinFocus::resetFocusPoint()
     m_focusPoint = QPointF(0.5, 0.5);
     m_focusRect.moveCenter(m_focusPoint);
 
-    updateRegionOfInterest(QVector<QRect>());
+    updateRegionOfInterest(QList<QRect>());
 
     if (focusRect != m_focusRect) {
         emit customFocusPointChanged(m_focusPoint);
@@ -412,14 +412,14 @@ static void appendRegion(GValue *regions, int priority, const QRect &rectangle)
 
 void CameraBinFocus::updateRegionOfInterest(const QRectF &rectangle)
 {
-    updateRegionOfInterest(QVector<QRect>() << QRect(
+    updateRegionOfInterest(QList<QRect>() << QRect(
             rectangle.x() * m_viewfinderResolution.width(),
             rectangle.y() * m_viewfinderResolution.height(),
             rectangle.width() * m_viewfinderResolution.width(),
             rectangle.height() * m_viewfinderResolution.height()));
 }
 
-void CameraBinFocus::updateRegionOfInterest(const QVector<QRect> &rectangles)
+void CameraBinFocus::updateRegionOfInterest(const QList<QRect> &rectangles)
 {
     if (m_cameraStatus != QCamera::ActiveStatus)
         return;
@@ -473,7 +473,7 @@ void CameraBinFocus::_q_updateFaces()
         return;
     }
 
-    QVector<QRect> faces;
+    QList<QRect> faces;
 
     {
         QMutexLocker locker(&m_mutex);
@@ -507,7 +507,7 @@ void CameraBinFocus::timerEvent(QTimerEvent *event)
 
 bool CameraBinFocus::probeBuffer(GstBuffer *buffer)
 {
-    QVector<QRect> faces;
+    QList<QRect> faces;
 
 #if GST_CHECK_VERSION(1,1,3)
     gpointer state = NULL;
diff --git a/src/plugins/gstreamer/camerabin/camerabinfocus.h b/src/plugins/gstreamer/camerabin/camerabinfocus.h
index 72a5006f9..0fca02c35 100644
--- a/src/plugins/gstreamer/camerabin/camerabinfocus.h
+++ b/src/plugins/gstreamer/camerabin/camerabinfocus.h
@@ -46,8 +46,8 @@
 #include <private/qgstreamerbufferprobe_p.h>
 
 #include <qbasictimer.h>
+#include <qlist.h>
 #include <qmutex.h>
-#include <qvector.h>
 
 #include <gst/gst.h>
 #include <glib.h>
@@ -108,7 +108,7 @@ private Q_SLOTS:
 private:
     void resetFocusPoint();
     void updateRegionOfInterest(const QRectF &rectangle);
-    void updateRegionOfInterest(const QVector<QRect> &rectangles);
+    void updateRegionOfInterest(const QList<QRect> &rectangles);
 
 #if GST_CHECK_VERSION(1,0,0)
     bool probeBuffer(GstBuffer *buffer) override;
@@ -123,8 +123,8 @@ private:
     QPointF m_focusPoint;
     QRectF m_focusRect;
     QSize m_viewfinderResolution;
-    QVector<QRect> m_faces;
-    QVector<QRect> m_faceFocusRects;
+    QList<QRect> m_faces;
+    QList<QRect> m_faceFocusRects;
     QBasicTimer m_faceResetTimer;
     mutable QMutex m_mutex;
 };
-- 
cgit v1.2.3