diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-11 01:00:56 +0100 |
---|---|---|
committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-03-11 15:39:56 +0100 |
commit | 3d315860cdf13fe2adf78c8eea07aea10444ed72 (patch) | |
tree | b5a7daa8534b8dadc3abfd665655af3a2450af76 /src/gui/painting/qpainterpath.cpp | |
parent | cd80f347cf5d40938df7c10d1f6dac3d8c81ff95 (diff) | |
parent | 865afac25036d58b18794384e37d42931b2164c5 (diff) |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/gui/painting/qpainterpath.cpp')
-rw-r--r-- | src/gui/painting/qpainterpath.cpp | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp index 11623c78f0..e3cdc218b2 100644 --- a/src/gui/painting/qpainterpath.cpp +++ b/src/gui/painting/qpainterpath.cpp @@ -1603,25 +1603,6 @@ QPainterPath QPainterPath::toReversed() const } /*! - \overload - - Converts the path into a list of polygons without any transformation, - and returns the list. - - This function creates one polygon for each subpath regardless of - intersecting subpaths (i.e. overlapping bounding rectangles). To - make sure that such overlapping subpaths are filled correctly, use - the toFillPolygons() function instead. - - \sa toFillPolygons(), toFillPolygon(), {QPainterPath#QPainterPath - Conversion}{QPainterPath Conversion} -*/ -QList<QPolygonF> QPainterPath::toSubpathPolygons() const -{ - return toSubpathPolygons(QTransform()); -} - -/*! Converts the path into a list of polygons using the QTransform \a matrix, and returns the list. @@ -1679,35 +1660,6 @@ QList<QPolygonF> QPainterPath::toSubpathPolygons(const QTransform &matrix) const } /*! - \overload - - Converts the path into a list of polygons without any transformation, - and returns the list. - - The function differs from the toFillPolygon() function in that it - creates several polygons. It is provided because it is usually - faster to draw several small polygons than to draw one large - polygon, even though the total number of points drawn is the same. - - The toFillPolygons() function differs from the toSubpathPolygons() - function in that it create only polygon for subpaths that have - overlapping bounding rectangles. - - Like the toFillPolygon() function, this function uses a rewinding - technique to make sure that overlapping subpaths can be filled - using the correct fill rule. Note that rewinding inserts addition - lines in the polygons so the outline of the fill polygon does not - match the outline of the path. - - \sa toSubpathPolygons(), toFillPolygon(), - {QPainterPath#QPainterPath Conversion}{QPainterPath Conversion} -*/ -QList<QPolygonF> QPainterPath::toFillPolygons() const -{ - return toFillPolygons(QTransform()); -} - -/*! Converts the path into a list of polygons using the QTransform \a matrix, and returns the list. @@ -2903,28 +2855,6 @@ void QPainterPathStroker::setDashOffset(qreal offset) } /*! - \overload - - Converts the path into a polygon without any transformation, - and returns the polygon. - - The polygon is created by first converting all subpaths to - polygons, then using a rewinding technique to make sure that - overlapping subpaths can be filled using the correct fill rule. - - Note that rewinding inserts addition lines in the polygon so - the outline of the fill polygon does not match the outline of - the path. - - \sa toSubpathPolygons(), toFillPolygons(), - {QPainterPath#QPainterPath Conversion}{QPainterPath Conversion} -*/ -QPolygonF QPainterPath::toFillPolygon() const -{ - return toFillPolygon(QTransform()); -} - -/*! Converts the path into a polygon using the QTransform \a matrix, and returns the polygon. |