diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-09-03 00:52:11 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-05 17:47:15 +0200 |
| commit | a78699e7f346bae5147017a872cb042cb834aa50 (patch) | |
| tree | a621a87fa8d9444a48110b9e36dda4310f5894d9 /src/widgets/kernel | |
| parent | c6d3fa1dcfbacdbcfb23b76ca6c5cede0ea9a5ef (diff) | |
Remove qSort from QtWidgets
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: Iec5c10fc4c3b4e684b51f6223bf3cb56acc42b58
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Diffstat (limited to 'src/widgets/kernel')
| -rw-r--r-- | src/widgets/kernel/qlayoutengine.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/kernel/qlayoutengine.cpp b/src/widgets/kernel/qlayoutengine.cpp index 9ef2a7096f..fe27edd35d 100644 --- a/src/widgets/kernel/qlayoutengine.cpp +++ b/src/widgets/kernel/qlayoutengine.cpp @@ -46,10 +46,10 @@ #include "qwidget.h" #include <qlist.h> -#include <qalgorithms.h> - #include <qdebug.h> +#include <algorithm> + QT_BEGIN_NAMESPACE //#define QLAYOUT_EXTRA_DEBUG @@ -134,7 +134,7 @@ void qGeomCalc(QVector<QLayoutStruct> &chain, int start, int count, for (i = start; i < start + count; i++) list << chain.at(i).minimumSize; - qSort(list); + std::sort(list.begin(), list.end()); int space_left = space - sumSpacing; |