Multimedia, MultimediaWidgets: replace foreach with range-based for

Change-Id: I6d291fb1a46686c9e7d5974c831d4d798de2f03a
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>

6 files changed, 37 insertions, 26 deletions

diff --git a/src/multimedia/qmediaobject.cpp b/src/multimedia/qmediaobject.cpp
index 4b5f86cf9..2b1edb437 100644
--- a/src/multimedia/qmediaobject.cpp
+++ b/src/multimedia/qmediaobject.cpp
@@ -49,7 +49,7 @@ void QMediaObjectPrivate::_q_notify()
 
     const QMetaObject* m = q->metaObject();
 
-    foreach (int pi, notifyProperties) {
+    for (int pi : qAsConst(notifyProperties)) {
         QMetaProperty p = m->property(pi);
         p.notifySignal().invoke(
             q, QGenericArgument(QMetaType::typeName(p.userType()), p.read(q).data()));
diff --git a/src/multimedia/qmediapluginloader.cpp b/src/multimedia/qmediapluginloader.cpp
index febadb1b8..679217318 100644
--- a/src/multimedia/qmediapluginloader.cpp
+++ b/src/multimedia/qmediapluginloader.cpp
@@ -77,7 +77,8 @@ QList<QObject*> QMediaPluginLoader::instances(QString const &key)
         return QList<QObject*>();
 
     QList<QObject *> objects;
-    foreach (QJsonObject jsonobj, m_metadata.value(key)) {
+    const auto list = m_metadata.value(key);
+    for (const QJsonObject &jsonobj : list) {
         int idx = jsonobj.value(QStringLiteral("index")).toDouble();
         if (idx < 0)
             continue;
@@ -125,7 +126,7 @@ void QMediaPluginLoader::loadMetadata()
         if (arr.isEmpty())
             arr = jsonobj.value(QStringLiteral("Keys")).toArray();
 
-        foreach (QJsonValue value, arr) {
+        for (const QJsonValue &value : qAsConst(arr)) {
             QString key = value.toString();
 
             if (!m_metadata.contains(key)) {
diff --git a/src/multimedia/qmediaserviceprovider.cpp b/src/multimedia/qmediaserviceprovider.cpp
index 38d31eac2..c3a91db7e 100644
--- a/src/multimedia/qmediaserviceprovider.cpp
+++ b/src/multimedia/qmediaserviceprovider.cpp
@@ -314,7 +314,8 @@ public:
         QString key(QLatin1String(type.constData()));
 
         QList<QMediaServiceProviderPlugin *>plugins;
-        foreach (QObject *obj, loader()->instances(key)) {
+        const auto instances = loader()->instances(key);
+        for (QObject *obj : instances) {
             QMediaServiceProviderPlugin *plugin =
                 qobject_cast<QMediaServiceProviderPlugin*>(obj);
             if (plugin)
@@ -331,7 +332,7 @@ public:
                 //prefer services not offering it, since they are likely to support
                 //more formats
                 if (type == QByteArray(Q_MEDIASERVICE_MEDIAPLAYER)) {
-                    foreach (QMediaServiceProviderPlugin *currentPlugin, plugins) {
+                    for (QMediaServiceProviderPlugin *currentPlugin : qAsConst(plugins)) {
                         QMediaServiceFeaturesInterface *iface =
                                 qobject_cast<QMediaServiceFeaturesInterface*>(currentPlugin);
 
@@ -346,7 +347,7 @@ public:
                 break;
             case QMediaServiceProviderHint::SupportedFeatures:
                 plugin = plugins[0];
-                foreach (QMediaServiceProviderPlugin *currentPlugin, plugins) {
+                for (QMediaServiceProviderPlugin *currentPlugin : qAsConst(plugins)) {
                     QMediaServiceFeaturesInterface *iface =
                             qobject_cast<QMediaServiceFeaturesInterface*>(currentPlugin);
 
@@ -360,7 +361,7 @@ public:
                 break;
             case QMediaServiceProviderHint::Device: {
                     plugin = plugins[0];
-                    foreach (QMediaServiceProviderPlugin *currentPlugin, plugins) {
+                    for (QMediaServiceProviderPlugin *currentPlugin : qAsConst(plugins)) {
                         QMediaServiceSupportedDevicesInterface *iface =
                                 qobject_cast<QMediaServiceSupportedDevicesInterface*>(currentPlugin);
 
@@ -375,7 +376,7 @@ public:
                     plugin = plugins[0];
                     if (type == QByteArray(Q_MEDIASERVICE_CAMERA)
                             && hint.cameraPosition() != QCamera::UnspecifiedPosition) {
-                        foreach (QMediaServiceProviderPlugin *currentPlugin, plugins) {
+                        for (QMediaServiceProviderPlugin *currentPlugin : qAsConst(plugins)) {
                             const QMediaServiceSupportedDevicesInterface *deviceIface =
                                     qobject_cast<QMediaServiceSupportedDevicesInterface*>(currentPlugin);
                             const QMediaServiceCameraInfoInterface *cameraIface =
@@ -383,7 +384,7 @@ public:
 
                             if (deviceIface && cameraIface) {
                                 const QList<QByteArray> cameras = deviceIface->devices(type);
-                                foreach (const QByteArray &camera, cameras) {
+                                for (const QByteArray &camera : cameras) {
                                     if (cameraIface->cameraPosition(camera) == hint.cameraPosition()) {
                                         plugin = currentPlugin;
                                         break;
@@ -396,7 +397,7 @@ public:
                 break;
             case QMediaServiceProviderHint::ContentType: {
                     QMultimedia::SupportEstimate estimate = QMultimedia::NotSupported;
-                    foreach (QMediaServiceProviderPlugin *currentPlugin, plugins) {
+                    for (QMediaServiceProviderPlugin *currentPlugin : qAsConst(plugins)) {
                         QMultimedia::SupportEstimate currentEstimate = QMultimedia::MaybeSupported;
                         QMediaServiceSupportedFormatsInterface *iface =
                                 qobject_cast<QMediaServiceSupportedFormatsInterface*>(currentPlugin);
@@ -465,7 +466,7 @@ public:
                                      const QStringList& codecs,
                                      int flags) const
     {
-        QList<QObject*> instances = loader()->instances(QLatin1String(serviceType));
+        const QList<QObject*> instances = loader()->instances(QLatin1String(serviceType));
 
         if (instances.isEmpty())
             return QMultimedia::NotSupported;
@@ -473,7 +474,7 @@ public:
         bool allServicesProvideInterface = true;
         QMultimedia::SupportEstimate supportEstimate = QMultimedia::NotSupported;
 
-        foreach(QObject *obj, instances) {
+        for (QObject *obj : instances) {
             QMediaServiceSupportedFormatsInterface *iface =
                     qobject_cast<QMediaServiceSupportedFormatsInterface*>(obj);
 
@@ -517,11 +518,11 @@ public:
 
     QStringList supportedMimeTypes(const QByteArray &serviceType, int flags) const
     {
-        QList<QObject*> instances = loader()->instances(QLatin1String(serviceType));
+        const QList<QObject*> instances = loader()->instances(QLatin1String(serviceType));
 
         QStringList supportedTypes;
 
-        foreach(QObject *obj, instances) {
+        for (QObject *obj : instances) {
             QMediaServiceSupportedFormatsInterface *iface =
                     qobject_cast<QMediaServiceSupportedFormatsInterface*>(obj);
 
@@ -564,7 +565,8 @@ public:
 
     QByteArray defaultDevice(const QByteArray &serviceType) const
     {
-        foreach (QObject *obj, loader()->instances(QLatin1String(serviceType))) {
+        const auto instances = loader()->instances(QLatin1String(serviceType));
+        for (QObject *obj : instances) {
             const QMediaServiceDefaultDeviceInterface *iface =
                     qobject_cast<QMediaServiceDefaultDeviceInterface*>(obj);
 
@@ -585,7 +587,8 @@ public:
     {
         QList<QByteArray> res;
 
-        foreach (QObject *obj, loader()->instances(QLatin1String(serviceType))) {
+        const auto instances = loader()->instances(QLatin1String(serviceType));
+        for (QObject *obj : instances) {
             QMediaServiceSupportedDevicesInterface *iface =
                     qobject_cast<QMediaServiceSupportedDevicesInterface*>(obj);
 
@@ -599,7 +602,8 @@ public:
 
     QString deviceDescription(const QByteArray &serviceType, const QByteArray &device)
     {
-        foreach (QObject *obj, loader()->instances(QLatin1String(serviceType))) {
+        const auto instances = loader()->instances(QLatin1String(serviceType));
+        for (QObject *obj : instances) {
             QMediaServiceSupportedDevicesInterface *iface =
                     qobject_cast<QMediaServiceSupportedDevicesInterface*>(obj);
 
@@ -615,7 +619,8 @@ public:
     QCamera::Position cameraPosition(const QByteArray &device) const
     {
         const QByteArray serviceType(Q_MEDIASERVICE_CAMERA);
-        foreach (QObject *obj, loader()->instances(QString::fromLatin1(serviceType))) {
+        const auto instances = loader()->instances(QString::fromLatin1(serviceType));
+        for (QObject *obj : instances) {
             const QMediaServiceSupportedDevicesInterface *deviceIface =
                     qobject_cast<QMediaServiceSupportedDevicesInterface*>(obj);
             const QMediaServiceCameraInfoInterface *cameraIface =
@@ -634,7 +639,8 @@ public:
     int cameraOrientation(const QByteArray &device) const
     {
         const QByteArray serviceType(Q_MEDIASERVICE_CAMERA);
-        foreach (QObject *obj, loader()->instances(QString::fromLatin1(serviceType))) {
+        const auto instances = loader()->instances(QString::fromLatin1(serviceType));
+        for (QObject *obj : instances) {
             const QMediaServiceSupportedDevicesInterface *deviceIface =
                     qobject_cast<QMediaServiceSupportedDevicesInterface*>(obj);
             const QMediaServiceCameraInfoInterface *cameraIface =
diff --git a/src/multimedia/qmediastoragelocation.cpp b/src/multimedia/qmediastoragelocation.cpp
index 8a6baa1a2..85aa1ba63 100644
--- a/src/multimedia/qmediastoragelocation.cpp
+++ b/src/multimedia/qmediastoragelocation.cpp
@@ -69,7 +69,7 @@ QDir QMediaStorageLocation::defaultLocation(MediaType type) const
     dirCandidates << QDir::currentPath();
     dirCandidates << QDir::tempPath();
 
-    Q_FOREACH (const QString &path, dirCandidates) {
+    for (const QString &path : qAsConst(dirCandidates)) {
         if (QFileInfo(path).isWritable())
             return QDir(path);
     }
@@ -110,7 +110,8 @@ QString QMediaStorageLocation::generateFileName(const QString &prefix,
 
     if (lastMediaIndex == 0) {
         // first run, find the maximum media number during the fist capture
-        Q_FOREACH (const QString &fileName, dir.entryList(QStringList() << QString(QLatin1String("%1*.%2")).arg(prefix).arg(extension))) {
+        const auto list = dir.entryList(QStringList() << QString(QLatin1String("%1*.%2")).arg(prefix).arg(extension));
+        for (const QString &fileName : list) {
             const qint64 mediaIndex = fileName.midRef(prefix.length(), fileName.size() - prefix.length() - extension.length() - 1).toInt();
             lastMediaIndex = qMax(lastMediaIndex, mediaIndex);
         }
diff --git a/src/multimedia/qmediatimerange.cpp b/src/multimedia/qmediatimerange.cpp
index b30ee0439..30535b160 100644
--- a/src/multimedia/qmediatimerange.cpp
+++ b/src/multimedia/qmediatimerange.cpp
@@ -488,7 +488,8 @@ void QMediaTimeRange::addInterval(const QMediaTimeInterval &interval)
 */
 void QMediaTimeRange::addTimeRange(const QMediaTimeRange &range)
 {
-    foreach(const QMediaTimeInterval &i, range.intervals()) {
+    const auto intervals = range.intervals();
+    for (const QMediaTimeInterval &i : intervals) {
         d->addInterval(i);
     }
 }
@@ -537,7 +538,8 @@ void QMediaTimeRange::removeInterval(const QMediaTimeInterval &interval)
 */
 void QMediaTimeRange::removeTimeRange(const QMediaTimeRange &range)
 {
-    foreach(const QMediaTimeInterval &i, range.intervals()) {
+    const auto intervals = range.intervals();
+    for (const QMediaTimeInterval &i : intervals) {
         d->removeInterval(i);
     }
 }
@@ -708,7 +710,8 @@ QDebug operator<<(QDebug dbg, const QMediaTimeRange &range)
     QDebugStateSaver saver(dbg);
     dbg.nospace();
     dbg << "QMediaTimeRange( ";
-    foreach (const QMediaTimeInterval &interval, range.intervals())
+    const auto intervals = range.intervals();
+    for (const QMediaTimeInterval &interval : intervals)
         dbg << '(' <<  interval.start() << ", " << interval.end() << ") ";
     dbg.space();
     dbg << ')';
diff --git a/src/multimediawidgets/qgraphicsvideoitem_maemo6.cpp b/src/multimediawidgets/qgraphicsvideoitem_maemo6.cpp
index 894025703..39ab39221 100644
--- a/src/multimediawidgets/qgraphicsvideoitem_maemo6.cpp
+++ b/src/multimediawidgets/qgraphicsvideoitem_maemo6.cpp
@@ -432,8 +432,8 @@ void QGraphicsVideoItem::paint(
         bool obscured = false;
 
         if (scene()) {
-            foreach (QGraphicsItem *item,
-                     scene()->items(mapToScene(boundingRect()), Qt::IntersectsItemBoundingRect) ) {
+            const auto items = scene()->items(mapToScene(boundingRect()), Qt::IntersectsItemBoundingRect);
+            for (QGraphicsItem *item : items) {
                 if (item->flags() & QGraphicsItem::ItemHasNoContents)
                     continue;