From 69837e6e04ae125186a8deaac59d82607fcd6d1a Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Fri, 13 Mar 2020 14:24:26 +0100
Subject: tst_qabstractvideosurface.cpp: Fix misuse of QMap as QMultiMap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use a QMultiMap and its insert-function, fixing warnings like:
In member function ‘QList<QVideoFrame::PixelFormat> tst_qabstractvideosurface.cpp:89:95: warning: ‘QMap<K, V>::iterator QMap<K, V>::insertMulti(const Key&, const T&) [with Key = QAbstractVideoBuffer::HandleType; T = QVideoFrame::PixelFormat]’ is deprecated: Use QMultiMap for maps storing multiple values with the same key.

Change-Id: I5514b4341b7f9ab3ce0f50618420ebe34433200e
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
---
 .../tst_qabstractvideosurface.cpp                      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'tests/auto')

diff --git a/tests/auto/unit/qabstractvideosurface/tst_qabstractvideosurface.cpp b/tests/auto/unit/qabstractvideosurface/tst_qabstractvideosurface.cpp
index 61299a964..b18dba5f7 100644
--- a/tests/auto/unit/qabstractvideosurface/tst_qabstractvideosurface.cpp
+++ b/tests/auto/unit/qabstractvideosurface/tst_qabstractvideosurface.cpp
@@ -58,7 +58,7 @@ private slots:
     void supportedFormatsChanged();
 };
 
-typedef QMap<QAbstractVideoBuffer::HandleType, QVideoFrame::PixelFormat> SupportedFormatMap;
+using SupportedFormatMap = QMultiMap<QAbstractVideoBuffer::HandleType, QVideoFrame::PixelFormat>;
 
 Q_DECLARE_METATYPE(SupportedFormatMap)
 
@@ -86,7 +86,7 @@ public:
     /* fun to generate supportedFormatsChanged signal */
     QList<QVideoFrame::PixelFormat> supportedPixelFormatsChange(QList<QVideoFrame::PixelFormat> formats)
     {
-        supportedFormats.insertMulti(QAbstractVideoBuffer::NoHandle, QVideoFrame::Format_RGB32);
+        supportedFormats.insert(QAbstractVideoBuffer::NoHandle, QVideoFrame::Format_RGB32);
         QList<QVideoFrame::PixelFormat> supportedFormats = supportedPixelFormats();
         if (supportedFormats.count() != formats.count()) {
             emit supportedFormatsChanged();
@@ -189,10 +189,10 @@ void tst_QAbstractVideoSurface::isFormatSupported_data()
                     QAbstractVideoBuffer::GLTextureHandle)
             << false;
 
-    formats.insertMulti(QAbstractVideoBuffer::NoHandle, QVideoFrame::Format_RGB32);
-    formats.insertMulti(QAbstractVideoBuffer::NoHandle, QVideoFrame::Format_RGB24);
-    formats.insertMulti(QAbstractVideoBuffer::NoHandle, QVideoFrame::Format_YUV444);
-    formats.insertMulti(QAbstractVideoBuffer::GLTextureHandle, QVideoFrame::Format_RGB32);
+    formats.insert(QAbstractVideoBuffer::NoHandle, QVideoFrame::Format_RGB32);
+    formats.insert(QAbstractVideoBuffer::NoHandle, QVideoFrame::Format_RGB24);
+    formats.insert(QAbstractVideoBuffer::NoHandle, QVideoFrame::Format_YUV444);
+    formats.insert(QAbstractVideoBuffer::GLTextureHandle, QVideoFrame::Format_RGB32);
 
     QTest::newRow("supported: rgb32")
             << formats
@@ -228,8 +228,8 @@ void tst_QAbstractVideoSurface::isFormatSupported_data()
                     QAbstractVideoBuffer::GLTextureHandle)
             << false;
 
-    formats.insertMulti(QAbstractVideoBuffer::NoHandle, QVideoFrame::Format_YV12);
-    formats.insertMulti(QAbstractVideoBuffer::GLTextureHandle, QVideoFrame::Format_RGB24);
+    formats.insert(QAbstractVideoBuffer::NoHandle, QVideoFrame::Format_YV12);
+    formats.insert(QAbstractVideoBuffer::GLTextureHandle, QVideoFrame::Format_RGB24);
 
     QTest::newRow("supported: yv12")
             << formats
@@ -377,7 +377,7 @@ void tst_QAbstractVideoSurface::nativeResolution()
 void tst_QAbstractVideoSurface::supportedFormatsChanged()
 {
     SupportedFormatMap formatMap;
-    formatMap.insertMulti(QAbstractVideoBuffer::NoHandle, QVideoFrame::Format_RGB24);
+    formatMap.insert(QAbstractVideoBuffer::NoHandle, QVideoFrame::Format_RGB24);
     QtTestVideoSurface surface(formatMap);
     QSignalSpy spy(&surface, SIGNAL(supportedFormatsChanged()));
     QList<QVideoFrame::PixelFormat> formats = surface.supportedPixelFormats();
-- 
cgit v1.2.3