AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove qSort usages from qtbase examples

Browse Source 
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>
This commit is contained in:
Giuseppe D'Angelo 2013-09-13 20:46:54 +02:00 committed by The Qt Project
parent 3a8b8edd01
commit 384ca58e33
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/network/torrent/torrentclient.cpp
View File

@ -50,6 +50,8 @@
#include <QtCore> #include <QtCore>
#include <QNetworkInterface> #include <QNetworkInterface>
#include <algorithm>
// These constants could also be configurable by the user. // These constants could also be configurable by the user.
static const int ServerMinPort = 6881; static const int ServerMinPort = 6881;
static const int ServerMaxPort = /* 6889 */ 7000; static const int ServerMaxPort = /* 6889 */ 7000;
@ -747,7 +749,7 @@ QList<TorrentPeer *> TorrentClient::weighedFreePeers() const
} }
points << QPair<int, TorrentPeer *>(tmp, peer); 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. // Minimize the list so the point difference is never more than 1.
typedef QPair<int,TorrentPeer*> PointPair; typedef QPair<int,TorrentPeer*> PointPair;

4
examples/widgets/painting/gradients/gradients.cpp
View File

@ -42,6 +42,8 @@
#include "gradients.h" #include "gradients.h"
#include "hoverpoints.h" #include "hoverpoints.h"
#include <algorithm>
ShadeWidget::ShadeWidget(ShadeType type, QWidget *parent) ShadeWidget::ShadeWidget(ShadeType type, QWidget *parent)
: QWidget(parent), m_shade_type(type), m_alpha_gradient(QLinearGradient(0, 0, 0, 0)) : 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_blue_shade->points();
points += m_alpha_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) { for (int i = 0; i < points.size(); ++i) {
qreal x = int(points.at(i).x()); qreal x = int(points.at(i).x());

6
examples/widgets/painting/shared/hoverpoints.cpp
View File

@ -46,6 +46,8 @@
#include "arthurwidgets.h" #include "arthurwidgets.h"
#include "hoverpoints.h" #include "hoverpoints.h"
#include <algorithm>
#define printf #define printf
HoverPoints::HoverPoints(QWidget *widget, PointShape shape) HoverPoints::HoverPoints(QWidget *widget, PointShape shape)
@ -388,9 +390,9 @@ void HoverPoints::firePointChange()
} }
if (m_sortType == XSort) 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) 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... // Compensate for changed order...
if (m_currentIndex != -1) { if (m_currentIndex != -1) {