summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-01-15 11:29:22 +0300
committerYoann Lopes <yoann.lopes@theqtcompany.com>2016-01-15 13:58:49 +0000
commit122de0fdc30ffbef569a61710693059a8eded8e0 (patch)
tree119f3d135149dc09925bf70c3c0671d74b3b1479 /src
parent6b5f9bb6e855dddd041ec6d98bf48b5c622751bf (diff)
Replace foreach with range-based for
... in Android, AudioCapture and m3u plugins. Change-Id: If06a97e49cfa4d32a41da2f043710cfdbd8a7b20 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/android/src/mediacapture/qandroidcamerasession.cpp2
-rw-r--r--src/plugins/audiocapture/audiocapturesession.cpp7
-rw-r--r--src/plugins/m3u/qm3uhandler.cpp2
3 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp b/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
index cf1879eb1..3623ce05a 100644
--- a/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
+++ b/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
@@ -613,7 +613,7 @@ void QAndroidCameraSession::onNewPreviewFrame(const QByteArray &frame, int width
QVideoFrame videoFrame(new DataVideoBuffer(frame, width),
QSize(width, height),
QVideoFrame::Format_NV21);
- foreach (QAndroidMediaVideoProbeControl *probe, m_videoProbes)
+ for (QAndroidMediaVideoProbeControl *probe : qAsConst(m_videoProbes))
probe->newFrameProbed(videoFrame);
}
m_videoProbesMutex.unlock();
diff --git a/src/plugins/audiocapture/audiocapturesession.cpp b/src/plugins/audiocapture/audiocapturesession.cpp
index 1b183db26..07f709e01 100644
--- a/src/plugins/audiocapture/audiocapturesession.cpp
+++ b/src/plugins/audiocapture/audiocapturesession.cpp
@@ -74,7 +74,7 @@ qint64 FileProbeProxy::writeData(const char *data, qint64 len)
if (m_format.isValid()) {
QMutexLocker locker(&m_probeMutex);
- foreach (AudioCaptureProbeControl* probe, m_probes)
+ for (AudioCaptureProbeControl* probe : qAsConst(m_probes))
probe->bufferProbed(data, len, m_format);
}
@@ -210,7 +210,7 @@ QDir AudioCaptureSession::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;
@@ -243,7 +243,8 @@ QString AudioCaptureSession::generateFileName(const QDir &dir,
const QString &ext) const
{
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);
}
diff --git a/src/plugins/m3u/qm3uhandler.cpp b/src/plugins/m3u/qm3uhandler.cpp
index c141376c7..e20b11006 100644
--- a/src/plugins/m3u/qm3uhandler.cpp
+++ b/src/plugins/m3u/qm3uhandler.cpp
@@ -105,7 +105,7 @@ public:
candidates << fileUrl;
candidates << url;
- foreach (const QUrl &candidate, candidates) {
+ for (const QUrl &candidate : qAsConst(candidates)) {
if (QFile::exists(candidate.toLocalFile())) {
nextResource = candidate;
break;