From 8849979754d45dc911e10e9b4942615352e5f3a0 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Thu, 20 Jun 2019 17:46:44 +0200 Subject: Remove usages of deprecated qSort Task-number: QTBUG-76491 Change-Id: I7a22d6612848e25bb780d205c6cdbb314cd4762d Reviewed-by: Volker Hilsheimer --- examples/multimedia/spectrum/app/engine.cpp | 4 ++-- src/plugins/android/src/wrappers/jni/androidcamera.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/multimedia/spectrum/app/engine.cpp b/examples/multimedia/spectrum/app/engine.cpp index 7e11d012b..a60904e5e 100644 --- a/examples/multimedia/spectrum/app/engine.cpp +++ b/examples/multimedia/spectrum/app/engine.cpp @@ -570,14 +570,14 @@ bool Engine::selectFormat() sampleRatesList += m_audioOutputDevice.supportedSampleRates(); sampleRatesList = sampleRatesList.toSet().toList(); // remove duplicates - qSort(sampleRatesList); + std::sort(sampleRatesList.begin(), sampleRatesList.end()); ENGINE_DEBUG << "Engine::initialize frequenciesList" << sampleRatesList; QList channelsList; channelsList += m_audioInputDevice.supportedChannelCounts(); channelsList += m_audioOutputDevice.supportedChannelCounts(); channelsList = channelsList.toSet().toList(); - qSort(channelsList); + std::sort(channelsList.begin(), channelsList.end()); ENGINE_DEBUG << "Engine::initialize channelsList" << channelsList; QAudioFormat format; diff --git a/src/plugins/android/src/wrappers/jni/androidcamera.cpp b/src/plugins/android/src/wrappers/jni/androidcamera.cpp index 90af0119a..a92a3373a 100644 --- a/src/plugins/android/src/wrappers/jni/androidcamera.cpp +++ b/src/plugins/android/src/wrappers/jni/androidcamera.cpp @@ -942,7 +942,7 @@ QList AndroidCameraPrivate::getSupportedPreviewSizes() list.append(QSize(size.getField("width"), size.getField("height"))); } - qSort(list.begin(), list.end(), qt_sizeLessThan); + std::sort(list.begin(), list.end(), qt_sizeLessThan); } return list; @@ -1541,7 +1541,7 @@ QList AndroidCameraPrivate::getSupportedPictureSizes() list.append(QSize(size.getField("width"), size.getField("height"))); } - qSort(list.begin(), list.end(), qt_sizeLessThan); + std::sort(list.begin(), list.end(), qt_sizeLessThan); } return list; -- cgit v1.2.3