diff options
Diffstat (limited to 'src/plugins/winrt')
-rw-r--r-- | src/plugins/winrt/qwinrtcameracontrol.cpp | 2 | ||||
-rw-r--r-- | src/plugins/winrt/qwinrtimageencodercontrol.cpp | 2 | ||||
-rw-r--r-- | src/plugins/winrt/qwinrtmediaplayercontrol.cpp | 3 | ||||
-rw-r--r-- | src/plugins/winrt/qwinrtvideodeviceselectorcontrol.cpp | 11 |
4 files changed, 10 insertions, 8 deletions
diff --git a/src/plugins/winrt/qwinrtcameracontrol.cpp b/src/plugins/winrt/qwinrtcameracontrol.cpp index 19b718cdd..d209d9394 100644 --- a/src/plugins/winrt/qwinrtcameracontrol.cpp +++ b/src/plugins/winrt/qwinrtcameracontrol.cpp @@ -936,7 +936,7 @@ HRESULT QWinRTCameraControl::initialize() // Set preview resolution. QVector<QSize> filtered; const float captureAspectRatio = float(captureResolution.width()) / captureResolution.height(); - foreach (const QSize &resolution, previewResolutions) { + for (const QSize &resolution : qAsConst(previewResolutions)) { const float aspectRatio = float(resolution.width()) / resolution.height(); if (qAbs(aspectRatio - captureAspectRatio) <= ASPECTRATIO_EPSILON) filtered.append(resolution); diff --git a/src/plugins/winrt/qwinrtimageencodercontrol.cpp b/src/plugins/winrt/qwinrtimageencodercontrol.cpp index 6260a1d66..fc28a8a18 100644 --- a/src/plugins/winrt/qwinrtimageencodercontrol.cpp +++ b/src/plugins/winrt/qwinrtimageencodercontrol.cpp @@ -109,7 +109,7 @@ void QWinRTImageEncoderControl::applySettings() // Find closest resolution from the list const int pixelCount = requestResolution.width() * requestResolution.height(); int minimumGap = std::numeric_limits<int>::max(); - foreach (const QSize &size, d->supportedResolutions) { + for (const QSize &size : qAsConst(d->supportedResolutions)) { int gap = qAbs(pixelCount - size.width() * size.height()); if (gap < minimumGap) { minimumGap = gap; diff --git a/src/plugins/winrt/qwinrtmediaplayercontrol.cpp b/src/plugins/winrt/qwinrtmediaplayercontrol.cpp index d00788e64..a07a6b622 100644 --- a/src/plugins/winrt/qwinrtmediaplayercontrol.cpp +++ b/src/plugins/winrt/qwinrtmediaplayercontrol.cpp @@ -762,7 +762,8 @@ void QWinRTMediaPlayerControl::setMedia(const QMediaContent &media, QIODevice *s QString urlString = media.canonicalUrl().toString(); if (!d->stream) { // If we can read the file via Qt, use the byte stream approach - foreach (const QMediaResource &resource, media.resources()) { + const auto resources = media.resources(); + for (const QMediaResource &resource : resources) { const QUrl url = resource.url(); if (url.isLocalFile()) { urlString = url.toLocalFile(); diff --git a/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.cpp b/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.cpp index 8e806dcbf..07b63be9a 100644 --- a/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.cpp +++ b/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.cpp @@ -158,7 +158,7 @@ private: if (isDefault) defaultDeviceIndex = index; - foreach (QWinRTVideoDeviceSelectorControl *watcher, watchers) + for (QWinRTVideoDeviceSelectorControl *watcher : qAsConst(watchers)) emit watcher->devicesChanged(); return S_OK; @@ -180,7 +180,7 @@ private: if (index >= 0) devices.remove(index); - foreach (QWinRTVideoDeviceSelectorControl *watcher, watchers) + for (QWinRTVideoDeviceSelectorControl *watcher : qAsConst(watchers)) emit watcher->devicesChanged(); return S_OK; @@ -189,7 +189,7 @@ private: HRESULT onDeviceUpdated(IDeviceWatcher *, IDeviceInformationUpdate *) { // A name or description may have changed, so emit devicesChanged - foreach (QWinRTVideoDeviceSelectorControl *watcher, watchers) + for (QWinRTVideoDeviceSelectorControl *watcher : qAsConst(watchers)) emit watcher->devicesChanged(); return S_OK; @@ -349,8 +349,9 @@ int QWinRTVideoDeviceSelectorControl::cameraOrientation(const QString &deviceNam QList<QByteArray> QWinRTVideoDeviceSelectorControl::deviceNames() { QList<QByteArray> devices; - foreach (const QString &device, g->deviceIndex.keys()) - devices.append(device.toUtf8()); + devices.reserve(g->deviceIndex.size()); + for (auto it = g->deviceIndex.keyBegin(), end = g->deviceIndex.keyEnd(); it != end; ++it) + devices.append((*it).toUtf8()); return devices; } |