diff options
Diffstat (limited to 'src/gui/painting/qpathclipper.cpp')
| -rw-r--r-- | src/gui/painting/qpathclipper.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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; |