diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-09-02 23:43:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-11 12:24:33 +0200 |
| commit | 3256856bbea22da03109b84ef407e8dbc69930e7 (patch) | |
| tree | 5a5719957902ffcf849a2dc03ad90af36958255f | |
| parent | f070b141b6b9fae28abc1169a09a4b5e9c7adc74 (diff) | |
Remove qSort usages from QtConcurrent
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I07a8b13f75eb789c45a7c2ef11c0dc15d9fdf8f6
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| -rw-r--r-- | src/concurrent/qtconcurrentmedian.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/concurrent/qtconcurrentmedian.h b/src/concurrent/qtconcurrentmedian.h index 7d3b50a45b..9079393388 100644 --- a/src/concurrent/qtconcurrentmedian.h +++ b/src/concurrent/qtconcurrentmedian.h @@ -47,7 +47,8 @@ #ifndef QT_NO_CONCURRENT #include <QtCore/qvector.h> -#include <QtCore/qalgorithms.h> + +#include <algorithm> QT_BEGIN_NAMESPACE @@ -102,7 +103,7 @@ public: if (dirty) { dirty = false; QVector<T> sorted = values; - qSort(sorted); + std::sort(sorted.begin(), sorted.end()); currentMedian = sorted.at(bufferSize / 2 + 1); } return currentMedian; |