diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-02 13:22:55 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-04 08:38:10 +0200 |
| commit | c87b626d709fae4f455e51f775a2b568b2621bde (patch) | |
| tree | 1a7922f8defcc484d94c49d31c1c1ed07c45756b /src/gui/painting/qpainterpath.h | |
| parent | 00a5629d8de18bc1a5dfb6e2526c03b4b021c903 (diff) | |
Merge QPainterPathPrivate and QPainterPathData
As per ### Qt 6 comment, and the code that never allocated QPainterPathPrivate.
Change-Id: I553e3559fdb2a675f37cdd9855462a2f22ef84c6
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src/gui/painting/qpainterpath.h')
| -rw-r--r-- | src/gui/painting/qpainterpath.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/painting/qpainterpath.h b/src/gui/painting/qpainterpath.h index c6bb68e35a..51a2874ed5 100644 --- a/src/gui/painting/qpainterpath.h +++ b/src/gui/painting/qpainterpath.h @@ -54,7 +54,6 @@ QT_BEGIN_NAMESPACE class QFont; class QPainterPathPrivate; struct QPainterPathPrivateDeleter; -class QPainterPathData; class QPainterPathStrokerPrivate; class QPen; class QPolygonF; @@ -209,9 +208,8 @@ private: void computeBoundingRect() const; void computeControlPointRect() const; - QPainterPathData *d_func() const { return reinterpret_cast<QPainterPathData *>(d_ptr.data()); } + QPainterPathPrivate *d_func() const { return d_ptr.data(); } - friend class QPainterPathData; friend class QPainterPathStroker; friend class QPainterPathStrokerPrivate; friend class QTransform; |