diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-12 10:12:09 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-12 19:24:52 +0000 |
commit | c327fb79e1a50c825a945e97f2c66d07a1c6d225 (patch) | |
tree | 78b6bc055b9699bbadd3c9debc1106511e99a3a0 /src/gui/painting/qoutlinemapper_p.h | |
parent | 0a1c8cc6686cb80cb5c35509c9eaa1fe9e27c495 (diff) |
Use QTransform instead of doing transforms manuallyv5.7.0-beta1
Minor cleanup of QOutlineMapper to take advantage of QTransform.
Change-Id: I15534970a821c7f1de42f4a5a2560f04ae420d16
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Diffstat (limited to 'src/gui/painting/qoutlinemapper_p.h')
-rw-r--r-- | src/gui/painting/qoutlinemapper_p.h | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/gui/painting/qoutlinemapper_p.h b/src/gui/painting/qoutlinemapper_p.h index 05b2fd14ec..47413d920c 100644 --- a/src/gui/painting/qoutlinemapper_p.h +++ b/src/gui/painting/qoutlinemapper_p.h @@ -104,16 +104,7 @@ public: */ void setMatrix(const QTransform &m) { - m_m11 = m.m11(); - m_m12 = m.m12(); - m_m13 = m.m13(); - m_m21 = m.m21(); - m_m22 = m.m22(); - m_m23 = m.m23(); - m_m33 = m.m33(); - m_dx = m.dx(); - m_dy = m.dy(); - m_txop = m.type(); + m_transform = m; qreal scale; qt_scaleForTransform(m, &scale); @@ -207,20 +198,10 @@ public: QRectF controlPointRect; // only valid after endOutline() QT_FT_Outline m_outline; - uint m_txop; int m_subpath_start; - // Matrix - qreal m_m11; - qreal m_m12; - qreal m_m13; - qreal m_m21; - qreal m_m22; - qreal m_m23; - qreal m_m33; - qreal m_dx; - qreal m_dy; + QTransform m_transform; qreal m_curve_threshold; |