From 2e78cf2213c006a96979c5c15534a3263da66995 Mon Sep 17 00:00:00 2001 From: Anton Kudryavtsev Date: Fri, 15 Jan 2016 11:23:38 +0300 Subject: Gstreamer plugin: replace foreach with range-based for Change-Id: Ic6d0f9d6b45eae1cdadc46783cb6f5bb7c64ac8c Reviewed-by: Yoann Lopes --- .../gstreamer/mediacapture/qgstreamerrecordercontrol.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp') diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp b/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp index 91bfd67f3..d30a2fe6f 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp @@ -242,7 +242,7 @@ void QGstreamerRecorderControl::applySettings() QString audioCodec; QString videoCodec; - foreach (const QString &containerCandidate, containerCandidates) { + for (const QString &containerCandidate : qAsConst(containerCandidates)) { QSet supportedTypes = mediaContainerControl->supportedStreamTypes(containerCandidate); audioCodec.clear(); @@ -250,7 +250,7 @@ void QGstreamerRecorderControl::applySettings() if (needAudio) { bool found = false; - foreach (const QString &audioCandidate, audioCandidates) { + for (const QString &audioCandidate : qAsConst(audioCandidates)) { QSet audioTypes = audioEncodeControl->supportedStreamTypes(audioCandidate); if (audioTypes.intersects(supportedTypes)) { found = true; @@ -264,7 +264,7 @@ void QGstreamerRecorderControl::applySettings() if (needVideo) { bool found = false; - foreach (const QString &videoCandidate, videoCandidates) { + for (const QString &videoCandidate : qAsConst(videoCandidates)) { QSet videoTypes = videoEncodeControl->supportedStreamTypes(videoCandidate); if (videoTypes.intersects(supportedTypes)) { found = true; @@ -339,7 +339,7 @@ QDir QGstreamerRecorderControl::defaultDir() const dirCandidates << QDir::currentPath(); dirCandidates << QDir::tempPath(); - foreach (const QString &path, dirCandidates) { + for (const QString &path : qAsConst(dirCandidates)) { QDir dir(path); if (dir.exists() && QFileInfo(path).isWritable()) return dir; @@ -352,7 +352,8 @@ QString QGstreamerRecorderControl::generateFileName(const QDir &dir, const QStri { int lastClip = 0; - foreach(QString fileName, dir.entryList(QStringList() << QString("clip_*.%1").arg(ext))) { + const auto list = dir.entryList(QStringList() << QString("clip_*.%1").arg(ext)); + for (const QString &fileName : list) { int imgNumber = fileName.midRef(5, fileName.size()-6-ext.length()).toInt(); lastClip = qMax(lastClip, imgNumber); } -- cgit v1.2.3