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>

2 files changed, 2 insertions, 6 deletions

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();