diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-09-03 00:04:10 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-05 23:20:09 +0200 |
| commit | aa3f358d433ec7fbe0237141c22297f3d8d4120d (patch) | |
| tree | 924e0f4387f601cf1183d0dbfa5433f641dc7a96 /src/gui/painting | |
| parent | 50a8a5e7959ca315e812413661a76576b7c3bbb8 (diff) | |
Remove deprecated QtAlgorithms calls from QtGui
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I324ddf6129fe8884ecea97ef47abb7c071dfb34c
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 3 | ||||
| -rw-r--r-- | src/gui/painting/qpathclipper.cpp | 7 | ||||
| -rw-r--r-- | src/gui/painting/qrasterizer.cpp | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 7112380043..3586b3452a 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -72,6 +72,7 @@ #include "qoutlinemapper_p.h" #include <limits.h> +#include <algorithm> #ifdef Q_OS_WIN # include <qvarlengtharray.h> @@ -1853,7 +1854,7 @@ static bool splitPolygon(const QPointF *points, int pointCount, QVector<QPointF> for (int i = 0; i < pointCount; ++i) sorted << points + i; - qSort(sorted.begin(), sorted.end(), isAbove); + std::sort(sorted.begin(), sorted.end(), isAbove); qreal splitY = sorted.at(sorted.size() / 2)->y(); diff --git a/src/gui/painting/qpathclipper.cpp b/src/gui/painting/qpathclipper.cpp index 243c99e671..61a6587233 100644 --- a/src/gui/painting/qpathclipper.cpp +++ b/src/gui/painting/qpathclipper.cpp @@ -45,6 +45,7 @@ #include <private/qdatabuffer_p.h> #include <private/qnumeric_p.h> #include <qmath.h> +#include <algorithm> /** The algorithm is as follows: @@ -824,7 +825,7 @@ void QWingedEdge::intersectAndAdd() } } - qSort(intersections.data(), intersections.data() + intersections.size()); + std::sort(intersections.data(), intersections.data() + intersections.size()); int first = m_segments.segmentAt(i).va; int second = m_segments.segmentAt(i).vb; @@ -1651,7 +1652,7 @@ bool QPathClipper::doClip(QWingedEdge &list, ClipperMode mode) for (int i = 0; i < list.vertexCount(); ++i) y_coords << list.vertex(i)->y; - qSort(y_coords.begin(), y_coords.end()); + std::sort(y_coords.begin(), y_coords.end()); y_coords.resize(qRemoveDuplicates(y_coords.begin(), y_coords.end(), fuzzyCompare) - y_coords.begin()); #ifdef QDEBUG_CLIPPER @@ -1827,7 +1828,7 @@ bool QPathClipper::handleCrossingEdges(QWingedEdge &list, qreal y, ClipperMode m QVector<QCrossingEdge> crossings = findCrossings(list, y); Q_ASSERT(!crossings.isEmpty()); - qSort(crossings.begin(), crossings.end()); + std::sort(crossings.begin(), crossings.end()); int windingA = 0; int windingB = 0; diff --git a/src/gui/painting/qrasterizer.cpp b/src/gui/painting/qrasterizer.cpp index 197d49369e..a7e7d89ec4 100644 --- a/src/gui/painting/qrasterizer.cpp +++ b/src/gui/painting/qrasterizer.cpp @@ -48,6 +48,8 @@ #include <private/qdatabuffer_p.h> #include <private/qdrawhelper_p.h> +#include <algorithm> + QT_BEGIN_NAMESPACE typedef int Q16Dot16; @@ -326,7 +328,7 @@ void qScanConvert(QScanConverter &d, T allVertical) d.m_active.reset(); return; } - qSort(d.m_lines.data(), d.m_lines.data() + d.m_lines.size(), QT_PREPEND_NAMESPACE(topOrder)); + std::sort(d.m_lines.data(), d.m_lines.data() + d.m_lines.size(), QT_PREPEND_NAMESPACE(topOrder)); int line = 0; for (int y = d.m_lines.first().top; y <= d.m_bottom; ++y) { for (; line < d.m_lines.size() && d.m_lines.at(line).top == y; ++line) { |