diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-02-15 14:52:31 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-02-28 07:13:18 +0000 |
| commit | 1df2974e0c30c34cf3c458c9c89047fe9685b84d (patch) | |
| tree | e310acb098ee2f6edadd6c4da8ab1a8c5f9c0926 /src/plugins/gstreamer/camerabin/camerabinsession.cpp | |
| parent | 0354fdda8b430f7749082ca55ad6c1dc781f3918 (diff) | |
Replace deprecated qSort() by std::sort()
Change-Id: I74ffd5bafaef9ebbe7f12600ad831c8deb58ae64
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinsession.cpp')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinsession.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp index 823cfe408..39f97e989 100644 --- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp @@ -80,6 +80,8 @@ #include <QtGui/qimage.h> #include <QtCore/qdatetime.h> +#include <algorithm> + //#define CAMERABIN_DEBUG 1 //#define CAMERABIN_DEBUG_DUMP_BIN 1 #define ENUM_NAME(c,e,v) (c::staticMetaObject.enumerator(c::staticMetaObject.indexOfEnumerator(e)).valueToKey((v))) @@ -1257,7 +1259,7 @@ QList< QPair<int,int> > CameraBinSession::supportedFrameRates(const QSize &frame readValue(rateValue, &res, continuous); } - qSort(res.begin(), res.end(), rateLessThan); + std::sort(res.begin(), res.end(), rateLessThan); #if CAMERABIN_DEBUG qDebug() << "Supported rates:" << caps; @@ -1384,7 +1386,7 @@ QList<QSize> CameraBinSession::supportedResolutions(QPair<int,int> rate, } - qSort(res.begin(), res.end(), resolutionLessThan); + std::sort(res.begin(), res.end(), resolutionLessThan); //if the range is continuos, populate is with the common rates if (isContinuous && res.size() >= 2) { |