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/widgets | |
| 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/widgets')
| -rw-r--r-- | src/widgets/widgets/qabstractbutton.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/widgets/qmdiarea.cpp | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp index be712f0747..cdadde5cc1 100644 --- a/src/widgets/widgets/qabstractbutton.cpp +++ b/src/widgets/widgets/qabstractbutton.cpp @@ -52,6 +52,8 @@ #include "qaccessible.h" #endif +#include <algorithm> + QT_BEGIN_NAMESPACE #define AUTO_REPEAT_DELAY 300 @@ -231,7 +233,7 @@ void QButtonGroup::addButton(QAbstractButton *button, int id) if (ids.isEmpty()) d->mapping[button] = -2; else { - qSort(ids); + std::sort(ids.begin(), ids.end()); d->mapping[button] = ids.first()-1; } } else { diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp index 13c9bf8deb..fd94dadac6 100644 --- a/src/widgets/widgets/qmdiarea.cpp +++ b/src/widgets/widgets/qmdiarea.cpp @@ -178,6 +178,8 @@ #include <qmath.h> #include <private/qlayoutengine_p.h> +#include <algorithm> + QT_BEGIN_NAMESPACE using namespace QMdi; @@ -465,9 +467,9 @@ void MinOverlapPlacer::getCandidatePlacements(const QSize &size, const QList<QRe } QList<int> xlist = xset.values(); - qSort(xlist.begin(), xlist.end()); + std::sort(xlist.begin(), xlist.end()); QList<int> ylist = yset.values(); - qSort(ylist.begin(), ylist.end()); + std::sort(ylist.begin(), ylist.end()); foreach (int y, ylist) foreach (int x, xlist) |