diff options
-rw-r--r-- | src/multimedia/playback/qmediaplaylist.cpp | 9 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplaylistprovider.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/video/qvideosurfaceformat.cpp | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/multimedia/playback/qmediaplaylist.cpp b/src/multimedia/playback/qmediaplaylist.cpp index 5f65a1884..219dbc1fa 100644 --- a/src/multimedia/playback/qmediaplaylist.cpp +++ b/src/multimedia/playback/qmediaplaylist.cpp @@ -475,7 +475,8 @@ void QMediaPlaylist::load(const QNetworkRequest &request, const char *format) return; } - foreach (QString const& key, playlistIOLoader()->keys()) { + const auto keys = playlistIOLoader()->keys(); + for (QString const& key : keys) { QMediaPlaylistIOInterface* plugin = qobject_cast<QMediaPlaylistIOInterface*>(playlistIOLoader()->instance(key)); if (plugin && plugin->canRead(request.url(), format)) { QMediaPlaylistReader *reader = plugin->createReader(request.url(), QByteArray(format)); @@ -536,7 +537,8 @@ void QMediaPlaylist::load(QIODevice * device, const char *format) return; } - foreach (QString const& key, playlistIOLoader()->keys()) { + const auto keys = playlistIOLoader()->keys(); + for (QString const& key : keys) { QMediaPlaylistIOInterface* plugin = qobject_cast<QMediaPlaylistIOInterface*>(playlistIOLoader()->instance(key)); if (plugin && plugin->canRead(device,format)) { QMediaPlaylistReader *reader = plugin->createReader(device,QByteArray(format)); @@ -598,7 +600,8 @@ bool QMediaPlaylist::save(QIODevice * device, const char *format) if (d->playlist()->save(device,format)) return true; - foreach (QString const& key, playlistIOLoader()->keys()) { + const auto keys = playlistIOLoader()->keys(); + for (QString const& key : keys) { QMediaPlaylistIOInterface* plugin = qobject_cast<QMediaPlaylistIOInterface*>(playlistIOLoader()->instance(key)); if (plugin && plugin->canWrite(device,format)) { QMediaPlaylistWriter *writer = plugin->createWriter(device,QByteArray(format)); diff --git a/src/multimedia/playback/qmediaplaylistprovider.cpp b/src/multimedia/playback/qmediaplaylistprovider.cpp index d9c989c85..ecdf2330e 100644 --- a/src/multimedia/playback/qmediaplaylistprovider.cpp +++ b/src/multimedia/playback/qmediaplaylistprovider.cpp @@ -172,7 +172,7 @@ bool QMediaPlaylistProvider::addMedia(const QMediaContent &media) */ bool QMediaPlaylistProvider::addMedia(const QList<QMediaContent> &items) { - foreach(const QMediaContent &item, items) { + for (const QMediaContent &item : items) { if (!addMedia(item)) return false; } diff --git a/src/multimedia/video/qvideosurfaceformat.cpp b/src/multimedia/video/qvideosurfaceformat.cpp index df6cbcfc1..bbc58054a 100644 --- a/src/multimedia/video/qvideosurfaceformat.cpp +++ b/src/multimedia/video/qvideosurfaceformat.cpp @@ -632,7 +632,8 @@ QDebug operator<<(QDebug dbg, const QVideoSurfaceFormat &f) << ", handleType=" << f.handleType() << ", yCbCrColorSpace=" << f.yCbCrColorSpace() << ')'; - foreach(const QByteArray& propertyName, f.propertyNames()) + const auto propertyNames = f.propertyNames(); + for (const QByteArray& propertyName : propertyNames) dbg << "\n " << propertyName.data() << " = " << f.property(propertyName.data()); return dbg; |