From 962371cbe3f01f3c30991522de1d03c8dfd77164 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Thu, 4 Jul 2019 10:56:08 +0200
Subject: Eradicate Java-style iterators and mark the module free of them

Java-style iterators are scheduled to be deprecated, or at the very
least banned from use in Qt's own implementation.

Ditto for QLinkedList.

Change-Id: I5471c293a7a050b92db47f7aeac15dd05bd46650
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
---
 src/gsttools/qgstutils.cpp                                   |  4 +---
 src/multimedia/audio/qaudiodeviceinfo.cpp                    | 12 ++++--------
 src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp    |  4 +---
 src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp |  4 +---
 src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp |  4 +---
 .../gstreamer/mediaplayer/qgstreamermetadataprovider.cpp     |  5 ++---
 6 files changed, 10 insertions(+), 23 deletions(-)

(limited to 'src')

diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp
index 9806af0fe..ac8808115 100644
--- a/src/gsttools/qgstutils.cpp
+++ b/src/gsttools/qgstutils.cpp
@@ -1307,9 +1307,7 @@ void QGstUtils::setMetaData(GstElement *element, const QMap<QByteArray, QVariant
 
     gst_tag_setter_reset_tags(GST_TAG_SETTER(element));
 
-    QMapIterator<QByteArray, QVariant> it(data);
-    while (it.hasNext()) {
-        it.next();
+    for (auto it = data.cbegin(), end = data.cend(); it != end; ++it) {
         const QString tagName = QString::fromLatin1(it.key());
         const QVariant tagValue = it.value();
 
diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodeviceinfo.cpp
index b8cac18eb..f87b1de9d 100644
--- a/src/multimedia/audio/qaudiodeviceinfo.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo.cpp
@@ -328,16 +328,12 @@ QAudioFormat QAudioDeviceInfo::nearestFormat(const QAudioFormat &settings) const
             nearest.setByteOrder(order);
             for (QAudioFormat::SampleType sample : qAsConst(testSampleTypes)) {
                 nearest.setSampleType(sample);
-                QMapIterator<int, int> sz(testSampleSizes);
-                while (sz.hasNext()) {
-                    sz.next();
-                    nearest.setSampleSize(sz.value());
+                for (int sampleSize : qAsConst(testSampleSizes)) {
+                    nearest.setSampleSize(sampleSize);
                     for (int channel : qAsConst(testChannels)) {
                         nearest.setChannelCount(channel);
-                        QMapIterator<int, int> i(testSampleRates);
-                        while (i.hasNext()) {
-                            i.next();
-                            nearest.setSampleRate(i.value());
+                        for (int sampleRate : qAsConst(testSampleRates)) {
+                            nearest.setSampleRate(sampleRate);
                             if (isFormatSupported(nearest))
                                 return nearest;
                         }
diff --git a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp b/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
index 29d7743ed..52ec75f44 100644
--- a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
@@ -149,9 +149,7 @@ gboolean CameraBinImageCapture::encoderEventProbe(
         tags[QMediaMetaData::FNumber] = extendedTags.value("capturing-focal-ratio");
         tags[QMediaMetaData::ExposureMode] = extendedTags.value("capturing-exposure-mode");
 
-        QMapIterator<QString, QVariant> i(tags);
-        while (i.hasNext()) {
-            i.next();
+        for (auto i = tags.cbegin(), end = tags.cend(); i != end; ++i) {
             if (i.value().isValid()) {
                 QMetaObject::invokeMethod(self, "imageMetadataAvailable",
                                           Qt::QueuedConnection,
diff --git a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp b/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
index 40294214a..361a2369a 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
@@ -214,9 +214,7 @@ GstElement *QGstreamerAudioEncode::createEncoder()
         }
 
         QMap<QString, QVariant> options = m_options.value(codec);
-        QMapIterator<QString,QVariant> it(options);
-        while (it.hasNext()) {
-            it.next();
+        for (auto it = options.cbegin(), end = options.cend(); it != end; ++it) {
             QString option = it.key();
             QVariant value = it.value();
 
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp b/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp
index 6b4dbe4b7..674e1034e 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp
@@ -204,9 +204,7 @@ GstElement *QGstreamerVideoEncode::createEncoder()
         }
 
         QMap<QString,QVariant> options = m_options.value(codec);
-        QMapIterator<QString,QVariant> it(options);
-        while (it.hasNext()) {
-            it.next();
+        for (auto it = options.cbegin(), end = options.cend(); it != end; ++it) {
             QString option = it.key();
             QVariant value = it.value();
 
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
index 8f2f6643c..bd503d3a1 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
@@ -167,9 +167,8 @@ void QGstreamerMetaDataProvider::updateTags()
     m_tags.clear();
     bool changed = false;
 
-    QMapIterator<QByteArray ,QVariant> i(m_session->tags());
-    while (i.hasNext()) {
-         i.next();
+    const auto tags = m_session->tags();
+    for (auto i = tags.cbegin(), end = tags.cend(); i != end; ++i) {
          //use gstreamer native keys for elements not in our key map
          QString key = qt_gstreamerMetaDataKeys()->value(i.key(), i.key());
          m_tags.insert(key, i.value());
-- 
cgit v1.2.3