From f4d63c777c901bdecc5f754169122e18cd2c4b49 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 25 Jul 2020 20:44:06 -0400 Subject: [PATCH] replace fuzzyCompare() with its body Signed-off-by: Ivailo Monev --- src/gui/painting/qpathclipper.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/gui/painting/qpathclipper.cpp b/src/gui/painting/qpathclipper.cpp index 84614e66b..0fac53364 100644 --- a/src/gui/painting/qpathclipper.cpp +++ b/src/gui/painting/qpathclipper.cpp @@ -1449,8 +1449,8 @@ QPathClipper::QPathClipper(const QPainterPath &subject, bMask = clipPath.fillRule() == Qt::WindingFill ? ~0x0 : 0x1; } -template -Iterator qRemoveDuplicates(Iterator begin, Iterator end, Equality eq) +template +Iterator qRemoveDuplicates(Iterator begin, Iterator end) { if (begin == end) return end; @@ -1459,7 +1459,7 @@ Iterator qRemoveDuplicates(Iterator begin, Iterator end, Equality eq) ++begin; Iterator insert = begin; for (Iterator it = begin; it != end; ++it) { - if (!eq(*it, *last)) { + if (!qFuzzyCompare(*it, *last)) { *insert++ = *it; last = it; } @@ -1493,11 +1493,6 @@ InputIterator qFuzzyFind(InputIterator first, InputIterator last, qreal val) return first; } -static bool fuzzyCompare(qreal a, qreal b) -{ - return qFuzzyCompare(a, b); -} - bool QPathClipper::pathToRect(const QPainterPath &path, QRectF *rect) { if (path.elementCount() != 5) @@ -1633,7 +1628,7 @@ bool QPathClipper::doClip(QWingedEdge &list) const y_coords << list.vertex(i)->y; qSort(y_coords.begin(), y_coords.end()); - y_coords.resize(qRemoveDuplicates(y_coords.begin(), y_coords.end(), fuzzyCompare) - y_coords.begin()); + y_coords.resize(qRemoveDuplicates(y_coords.begin(), y_coords.end()) - y_coords.begin()); #ifdef QDEBUG_CLIPPER printf("sorted y coords:\n"); -- 2.11.0