Merge branch 'dev' of git://code.qt.io/qt/qtmultimedia into wip/qt6

Change-Id: I91e8d902cd916ee16a2495da9bf40a34c6bc05d2

1 files changed, 6 insertions, 6 deletions

diff --git a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
index 52f3203be..f851caadd 100644
--- a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
@@ -179,8 +179,8 @@ void overview_movie()
 void camera_listing()
 {
     //! [Camera listing]
-    QList<QCameraInfo> cameras = QCameraInfo::availableCameras();
-    foreach (const QCameraInfo &cameraInfo, cameras)
+    const QList<QCameraInfo> cameras = QCameraInfo::availableCameras();
+    for (const QCameraInfo &cameraInfo : cameras)
         qDebug() << cameraInfo.deviceName();
     //! [Camera listing]
 }
@@ -188,8 +188,8 @@ void camera_listing()
 void camera_selection()
 {
     //! [Camera selection]
-    QList<QCameraInfo> cameras = QCameraInfo::availableCameras();
-    foreach (const QCameraInfo &cameraInfo, cameras) {
+    const QList<QCameraInfo> cameras = QCameraInfo::availableCameras();
+    for (const QCameraInfo &cameraInfo : cameras) {
         if (cameraInfo.deviceName() == "mycamera")
             camera = new QCamera(cameraInfo);
     }
@@ -269,8 +269,8 @@ void camerafocus()
 
     //! [Camera focus zones]
     focus->setFocusPointMode(QCameraFocus::FocusPointAuto);
-    QList<QCameraFocusZone> zones = focus->focusZones();
-    foreach (QCameraFocusZone zone, zones) {
+    const QList<QCameraFocusZone> zones = focus->focusZones();
+    for (const QCameraFocusZone &zone : zones) {
         if (zone.status() == QCameraFocusZone::Focused) {
             // Draw a green box at zone.area()
         } else if (zone.status() == QCameraFocusZone::Selected) {