Add default arguments to QPainterPath methods using transform

Fixes: QTBUG-82602
Change-Id: Id82f145ffb33e6d4ef9b81282ad14657b1c8fbd0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

examples/opengl/paintedwindow/paintedwindow.cpp

@@ -54,6 +54,7 @@
 #include <QOpenGLContext>
 #include <QOpenGLPaintDevice>
 #include <QPainter>
+#include <QPainterPath>
 #include <QScreen>
 #include <QTimer>
 

examples/opengl/qopenglwindow/main.cpp

@@ -51,6 +51,7 @@
 #include <QOpenGLWindow>
 #include <QScreen>
 #include <QPainter>
+#include <QPainterPath>
 #include <QGuiApplication>
 #include <QMatrix4x4>
 #include <QStaticText>

examples/qpa/qrasterwindow/main.cpp

@@ -50,6 +50,7 @@
 
 #include <QRasterWindow>
 #include <QPainter>
+#include <QPainterPath>
 #include <QGuiApplication>
 #include <QMatrix4x4>
 #include <QTimer>

examples/widgets/painting/basicdrawing/renderarea.cpp

@@ -51,6 +51,7 @@
 #include "renderarea.h"
 
 #include <QPainter>
+#include <QPainterPath>
 
 //! [0]
 RenderArea::RenderArea(QWidget *parent)

examples/widgets/widgets/styles/norwegianwoodstyle.cpp

@@ -52,6 +52,7 @@
 
 #include <QComboBox>
 #include <QPainter>
+#include <QPainterPath>
 #include <QPushButton>
 #include <QStyleFactory>
 

src/gui/painting/qpainterpath.h

@@ -42,6 +42,7 @@
 
 #include <QtGui/qtguiglobal.h>
 #include <QtGui/qmatrix.h>
+#include <QtGui/qtransform.h>
 #include <QtCore/qglobal.h>
 #include <QtCore/qrect.h>
 #include <QtCore/qline.h>
@@ -178,15 +179,15 @@ public:
 
 #if QT_DEPRECATED_SINCE(5, 15)
     QT_DEPRECATED_X("Use toSubpathPolygons(const QTransform &)")
-    QList<QPolygonF> toSubpathPolygons(const QMatrix &matrix = QMatrix()) const;
+    QList<QPolygonF> toSubpathPolygons(const QMatrix &matrix) const;
     QT_DEPRECATED_X("Use toFillPolygons(const QTransform &")
-    QList<QPolygonF> toFillPolygons(const QMatrix &matrix = QMatrix()) const;
+    QList<QPolygonF> toFillPolygons(const QMatrix &matrix) const;
     QT_DEPRECATED_X("Use toFillPolygon(const QTransform &)")
-    QPolygonF toFillPolygon(const QMatrix &matrix = QMatrix()) const;
+    QPolygonF toFillPolygon(const QMatrix &matrix) const;
 #endif // QT_DEPRECATED_SINCE(5, 15)
-    QList<QPolygonF> toSubpathPolygons(const QTransform &matrix) const;
-    QList<QPolygonF> toFillPolygons(const QTransform &matrix) const;
-    QPolygonF toFillPolygon(const QTransform &matrix) const;
+    QList<QPolygonF> toSubpathPolygons(const QTransform &matrix = QTransform()) const;
+    QList<QPolygonF> toFillPolygons(const QTransform &matrix = QTransform()) const;
+    QPolygonF toFillPolygon(const QTransform &matrix = QTransform()) const;
 
     int elementCount() const;
     QPainterPath::Element elementAt(int i) const;
@@ -362,6 +363,8 @@ inline void QPainterPath::translate(const QPointF &offset)
 inline QPainterPath QPainterPath::translated(const QPointF &offset) const
 { return translated(offset.x(), offset.y()); }
 
+inline QPainterPath operator *(const QPainterPath &p, const QTransform &m)
+{ return m.map(p); }
 
 #ifndef QT_NO_DEBUG_STREAM
 Q_GUI_EXPORT QDebug operator<<(QDebug, const QPainterPath &);

src/gui/painting/qrasterizer.cpp

@@ -46,6 +46,8 @@
 #include <private/qdatabuffer_p.h>
 #include <private/qdrawhelper_p.h>
 
+#include <QtGui/qpainterpath.h>
+
 #include <algorithm>
 
 QT_BEGIN_NAMESPACE

src/gui/painting/qtextureglyphcache.cpp

@@ -43,6 +43,8 @@
 #include "private/qfontengine_p.h"
 #include "private/qnumeric_p.h"
 
+#include <QtGui/qpainterpath.h>
+
 QT_BEGIN_NAMESPACE
 
 // #define CACHE_DEBUG

src/gui/painting/qtransform.h

@@ -41,7 +41,6 @@
 
 #include <QtGui/qtguiglobal.h>
 #include <QtGui/qmatrix.h>
-#include <QtGui/qpainterpath.h>
 #include <QtGui/qpolygon.h>
 #include <QtGui/qregion.h>
 #include <QtGui/qwindowdefs.h>
@@ -51,8 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
-
 class QVariant;
+class QPainterPath;
 
 class Q_GUI_EXPORT QTransform
 {
@@ -408,8 +407,6 @@ inline QPolygonF operator *(const QPolygonF &a, const QTransform &m)
 { return m.map(a); }
 inline QRegion operator *(const QRegion &r, const QTransform &m)
 { return m.map(r); }
-inline QPainterPath operator *(const QPainterPath &p, const QTransform &m)
-{ return m.map(p); }
 
 inline QTransform operator *(const QTransform &a, qreal n)
 { QTransform t(a); t *= n; return t; }

src/gui/text/qrawfont.cpp

@@ -51,6 +51,7 @@
 
 #include <QtCore/qendian.h>
 #include <QtCore/qfile.h>
+#include <QtGui/qpainterpath.h>
 
 QT_BEGIN_NAMESPACE
 

src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp

@@ -48,6 +48,7 @@
 #include <qscreen.h>
 #include <qpa/qplatformscreen.h>
 #include <QtCore/QUuid>
+#include <QtGui/QPainterPath>
 
 #ifndef QT_NO_FREETYPE
 

src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm

@@ -45,6 +45,7 @@
 #include <QtCore/qsettings.h>
 #endif
 #include <QtCore/qoperatingsystemversion.h>
+#include <QtGui/qpainterpath.h>
 #include <private/qcoregraphics_p.h>
 #include <private/qimage_p.h>
 

src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp

@@ -51,6 +51,7 @@
 #include <QtGui/private/qguiapplication_p.h>
 #include <qpa/qplatformintegration.h>
 #include <QtGui/private/qhighdpiscaling_p.h>
+#include <QtGui/qpainterpath.h>
 
 #if defined(QT_USE_DIRECTWRITE2)
 #  include <dwrite_2.h>

src/plugins/styles/mac/qmacstyle_mac.mm

@@ -56,6 +56,7 @@
 
 #include <QtCore/private/qcore_mac_p.h>
 
+#include <QtGui/qpainterpath.h>
 #include <QtGui/private/qcoregraphics_p.h>
 #include <QtGui/qpa/qplatformfontdatabase.h>
 #include <QtGui/qpa/qplatformtheme.h>

src/widgets/graphicsview/qgraphicsscene.cpp

@@ -233,6 +233,7 @@
 #include <QtWidgets/qgraphicswidget.h>
 #include <QtGui/qpaintengine.h>
 #include <QtGui/qpainter.h>
+#include <QtGui/qpainterpath.h>
 #include <QtGui/qpixmapcache.h>
 #include <QtGui/qpolygon.h>
 #include <QtGui/qtouchdevice.h>

src/widgets/graphicsview/qgraphicssceneindex.cpp

@@ -60,6 +60,7 @@
 #include "qgraphicswidget.h"
 #include "qgraphicssceneindex_p.h"
 #include "qgraphicsscenebsptreeindex_p.h"
+#include <QtGui/qpainterpath.h>
 
 QT_BEGIN_NAMESPACE
 

src/widgets/graphicsview/qgraphicsview.cpp

@@ -294,6 +294,7 @@ static const int QGRAPHICSVIEW_PREALLOC_STYLE_OPTIONS = 503; // largest prime <
 #include <QtGui/qtransform.h>
 #include <QtGui/qmatrix.h>
 #include <QtGui/qpainter.h>
+#include <QtGui/qpainterpath.h>
 #include <QtWidgets/qscrollbar.h>
 #include <QtWidgets/qstyleoption.h>
 

src/widgets/graphicsview/qgraphicswidget.cpp

@@ -59,6 +59,7 @@
 #include <QtWidgets/qgraphicsview.h>
 #include <QtWidgets/qgraphicsproxywidget.h>
 #include <QtGui/qpalette.h>
+#include <QtGui/qpainterpath.h>
 #include <QtWidgets/qstyleoption.h>
 
 #include <qdebug.h>

src/widgets/styles/qfusionstyle.cpp

@@ -52,6 +52,7 @@
 #include <qabstractbutton.h>
 #endif
 #include <qpainter.h>
+#include <qpainterpath.h>
 #include <qdir.h>
 #include <qstyleoption.h>
 #include <qapplication.h>

src/widgets/styles/qstylesheetstyle.cpp

@@ -118,6 +118,7 @@
 #include <QtWidgets/qtoolbar.h>
 #endif
 
+#include <QtGui/qpainterpath.h>
 #include <QtGui/qscreen.h>
 
 QT_BEGIN_NAMESPACE

src/widgets/styles/qwindowsstyle.cpp

@@ -78,6 +78,7 @@
 #endif
 #include <private/qmath_p.h>
 #include <qmath.h>
+#include <QtGui/qpainterpath.h>
 #include <QtGui/qscreen.h>
 #include <QtGui/qwindow.h>
 #include <qpa/qplatformtheme.h>

tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp

@@ -28,12 +28,13 @@
 
 #include <QtTest/QtTest>
 #include <QtGui/QBitmap>
-#include <QtGui/QPalette>
-#include <QtGui/QPixmap>
-#include <QtGui/QPicture>
-#include <QtGui/QTextLength>
 #include <QtGui/QPainter>
+#include <QtGui/QPainterPath>
+#include <QtGui/QPalette>
 #include <QtGui/QPen>
+#include <QtGui/QPicture>
+#include <QtGui/QPixmap>
+#include <QtGui/QTextLength>
 
 class tst_QDataStream : public QObject
 {

tests/auto/gui/painting/qpainter/tst_qpainter.cpp

@@ -46,6 +46,7 @@
 
 #include <private/qdrawhelper_p.h>
 #include <qpainter.h>
+#include <qpainterpath.h>
 #include <qqueue.h>
 #include <qscreen.h>
 

tests/auto/gui/painting/qregion/tst_qregion.cpp

@@ -32,6 +32,7 @@
 
 #include <qbitmap.h>
 #include <qpainter.h>
+#include <qpainterpath.h>
 #include <qpolygon.h>
 
 class tst_QRegion : public QObject

tests/auto/gui/painting/qtransform/tst_qtransform.cpp

@@ -28,11 +28,11 @@
 
 
 #include <QtTest/QtTest>
-#include "qtransform.h"
+#include <qpainterpath.h>
 #include <qpolygon.h>
+#include <qtransform.h>
 #include <qdebug.h>
 
-
 class tst_QTransform : public QObject
 {
     Q_OBJECT

tests/auto/gui/qopengl/tst_qopengl.cpp

@@ -36,6 +36,7 @@
 #include <QtGui/QOpenGLPaintDevice>
 #include <QtGui/QOpenGLTexture>
 #include <QtGui/QPainter>
+#include <QtGui/QPainterPath>
 #include <QtGui/QScreen>
 #include <QtGui/QWindow>
 #include <QtGui/QOffscreenSurface>

tests/auto/opengl/qgl/tst_qgl.cpp

@@ -36,6 +36,7 @@
 #include <qglframebufferobject.h>
 #include <qglcolormap.h>
 #include <qpaintengine.h>
+#include <qpainterpath.h>
 #include <qopenglfunctions.h>
 #include <qopenglframebufferobject.h>
 #include <qopenglpaintdevice.h>

tests/auto/other/lancelot/paintcommands.cpp

@@ -31,6 +31,7 @@
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qpainter.h>
+#include <qpainterpath.h>
 #include <qbitmap.h>
 #include <qtextstream.h>
 #include <qtextlayout.h>

tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp

@@ -59,6 +59,7 @@
 #include <QSharedPointer>
 #include <float.h>
 #include <QStyleHints>
+#include <QPainterPath>
 
 using AbstractGraphicsShapeItemPtr = QSharedPointer<QAbstractGraphicsShapeItem>;
 using GraphicsItems = QVector<QGraphicsItem *>;

tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp

@@ -30,6 +30,7 @@
 #include <QtTest/QtTest>
 #include <qgraphicsscene.h>
 #include <qgraphicsitem.h>
+#include <qpainterpath.h>
 
 class tst_QGraphicsPixmapItem : public QObject
 {

tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp

@@ -29,6 +29,7 @@
 
 #include <QtTest/QtTest>
 #include <qgraphicsitem.h>
+#include <qpainterpath.h>
 #include <qpen.h>
 
 

tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp

@@ -37,6 +37,7 @@
 #include <QtWidgets/QStyleFactory>
 #include <QtWidgets/QVBoxLayout>
 
+#include <QtGui/QPainterPath>
 #include <QtGui/QScreen>
 
 #include <QtTest/QtTest>

tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp

@@ -28,6 +28,7 @@
 
 
 #include <QtTest/QtTest>
+#include <QtGui/QPainterPath>
 #include <QtWidgets/qgraphicsscene.h>
 #include <private/qgraphicsscenebsptreeindex_p.h>
 #include <private/qgraphicssceneindex_p.h>

tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp

@@ -30,6 +30,7 @@
 #include <QtCore/QRectF>
 #include <QtGui/QTransform>
 #include <QtGui/QGuiApplication>
+#include <QtGui/QPainterPath>
 #include <QtGui/QScreen>
 #include <QtWidgets/QStyle>
 #include <QtWidgets/QStyleFactory>

tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp

@@ -58,6 +58,7 @@
 #include <qtoolbutton.h>
 #include <QtCore/qoperatingsystemversion.h>
 #include <QtGui/qpaintengine.h>
+#include <QtGui/qpainterpath.h>
 #include <QtGui/qbackingstore.h>
 #include <QtGui/qguiapplication.h>
 #include <QtGui/qpa/qplatformwindow.h>

tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp

@@ -28,6 +28,7 @@
 
 #include <qtest.h>
 #include <QPainter>
+#include <QPainterPath>
 #include <QPixmap>
 #include <QImage>
 #include <QPaintEngine>

tests/benchmarks/gui/painting/qtbench/benchmarktests.h

@@ -37,6 +37,7 @@
 #include <QDebug>
 #include <QStaticText>
 #include <QPainter>
+#include <QPainterPath>
 #include <QRandomGenerator>
 
 class Benchmark

tests/benchmarks/gui/painting/qtransform/tst_qtransform.cpp

@@ -28,6 +28,7 @@
 
 #include <qtest.h>
 #include <QTransform>
+#include <QPainterPath>
 
 class tst_QTransform : public QObject
 {