diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-02-03 16:18:20 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-02-28 08:57:57 +0100 |
| commit | 1ba46c9b632731d7d7e791de2b203d0d933245b9 (patch) | |
| tree | a7933031bde57f582181c2e9c185989ebdbb9470 /src/gui/painting/qbrush.h | |
| parent | d2068b24e4b2e96832af154d02e19b5333880c21 (diff) | |
Get rid of QMatrix
Task-number: QTBUG-81628
Change-Id: Iad66bfdf49b9ee65558a451108c086fc40dc3884
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/gui/painting/qbrush.h')
| -rw-r--r-- | src/gui/painting/qbrush.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/gui/painting/qbrush.h b/src/gui/painting/qbrush.h index 9a719b3059..621387615b 100644 --- a/src/gui/painting/qbrush.h +++ b/src/gui/painting/qbrush.h @@ -46,7 +46,6 @@ #include <QtCore/qvector.h> #include <QtCore/qscopedpointer.h> #include <QtGui/qcolor.h> -#include <QtGui/qmatrix.h> #include <QtGui/qtransform.h> #include <QtGui/qimage.h> #include <QtGui/qpixmap.h> @@ -89,11 +88,6 @@ public: inline Qt::BrushStyle style() const; void setStyle(Qt::BrushStyle); -#if QT_DEPRECATED_SINCE(5, 15) - QT_DEPRECATED_X("Use transform()") inline QMatrix matrix() const; - QT_DEPRECATED_X("Use setTransform()") void setMatrix(const QMatrix &mat); -#endif // QT_DEPRECATED_SINCE(5, 15) - inline QTransform transform() const; void setTransform(const QTransform &); @@ -159,10 +153,6 @@ struct QBrushData inline Qt::BrushStyle QBrush::style() const { return d->style; } inline const QColor &QBrush::color() const { return d->color; } -#if QT_DEPRECATED_SINCE(5, 15) -QT_DEPRECATED_X("Use transform()") -inline QMatrix QBrush::matrix() const { return d->transform.toAffine(); } -#endif // QT_DEPRECATED_SINCE(5, 15) inline QTransform QBrush::transform() const { return d->transform; } inline bool QBrush::isDetached() const { return d->ref.loadRelaxed() == 1; } |