diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-09-13 20:46:54 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-14 13:12:40 +0200 |
| commit | 384ca58e33eb1406243b7fece57ff01bd9675779 (patch) | |
| tree | dc0336b9f12a98117055fcec0e727c7cd379a068 /examples | |
| parent | 3a8b8edd0180594b84a97b974c188b39f17c9f49 (diff) | |
Remove qSort usages from qtbase examples
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I68dec0cb6efa1f164ba9f1671b55332ee4ad2e23
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/network/torrent/torrentclient.cpp | 4 | ||||
| -rw-r--r-- | examples/widgets/painting/gradients/gradients.cpp | 4 | ||||
| -rw-r--r-- | examples/widgets/painting/shared/hoverpoints.cpp | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/examples/network/torrent/torrentclient.cpp b/examples/network/torrent/torrentclient.cpp index b5969e552e..f0f47fe884 100644 --- a/examples/network/torrent/torrentclient.cpp +++ b/examples/network/torrent/torrentclient.cpp @@ -50,6 +50,8 @@ #include <QtCore> #include <QNetworkInterface> +#include <algorithm> + // These constants could also be configurable by the user. static const int ServerMinPort = 6881; static const int ServerMaxPort = /* 6889 */ 7000; @@ -747,7 +749,7 @@ QList<TorrentPeer *> TorrentClient::weighedFreePeers() const } points << QPair<int, TorrentPeer *>(tmp, peer); } - qSort(points); + std::sort(points.begin(), points.end()); // Minimize the list so the point difference is never more than 1. typedef QPair<int,TorrentPeer*> PointPair; diff --git a/examples/widgets/painting/gradients/gradients.cpp b/examples/widgets/painting/gradients/gradients.cpp index ffca9f5560..14858b9749 100644 --- a/examples/widgets/painting/gradients/gradients.cpp +++ b/examples/widgets/painting/gradients/gradients.cpp @@ -42,6 +42,8 @@ #include "gradients.h" #include "hoverpoints.h" +#include <algorithm> + ShadeWidget::ShadeWidget(ShadeType type, QWidget *parent) : QWidget(parent), m_shade_type(type), m_alpha_gradient(QLinearGradient(0, 0, 0, 0)) { @@ -204,7 +206,7 @@ void GradientEditor::pointsUpdated() points += m_blue_shade->points(); points += m_alpha_shade->points(); - qSort(points.begin(), points.end(), x_less_than); + std::sort(points.begin(), points.end(), x_less_than); for (int i = 0; i < points.size(); ++i) { qreal x = int(points.at(i).x()); diff --git a/examples/widgets/painting/shared/hoverpoints.cpp b/examples/widgets/painting/shared/hoverpoints.cpp index 36e0ad89b2..7a79560473 100644 --- a/examples/widgets/painting/shared/hoverpoints.cpp +++ b/examples/widgets/painting/shared/hoverpoints.cpp @@ -46,6 +46,8 @@ #include "arthurwidgets.h" #include "hoverpoints.h" +#include <algorithm> + #define printf HoverPoints::HoverPoints(QWidget *widget, PointShape shape) @@ -388,9 +390,9 @@ void HoverPoints::firePointChange() } if (m_sortType == XSort) - qSort(m_points.begin(), m_points.end(), x_less_than); + std::sort(m_points.begin(), m_points.end(), x_less_than); else if (m_sortType == YSort) - qSort(m_points.begin(), m_points.end(), y_less_than); + std::sort(m_points.begin(), m_points.end(), y_less_than); // Compensate for changed order... if (m_currentIndex != -1) { |