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>
This commit is contained in:
Jarek Kobus 2020-03-05 09:36:49 +01:00
parent ccee938b51
commit 50d2acdc93
38 changed files with 53 additions and 16 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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