summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qmatrix.h
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-09-22 08:35:08 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-09-22 09:18:43 (GMT)
commitb7647b38103676c68ad603d1391e62c5d01dc3b2 (patch)
tree1cfd3d9e9458965763b64a3b5e49454cba423c73 /src/gui/painting/qmatrix.h
parent66c8ec60ff44fa8f2fb0d3994ffccf4b033fdb70 (diff)
downloadQt-b7647b38103676c68ad603d1391e62c5d01dc3b2.zip
Qt-b7647b38103676c68ad603d1391e62c5d01dc3b2.tar.gz
Qt-b7647b38103676c68ad603d1391e62c5d01dc3b2.tar.bz2
Fixes some warning in headers
such as margins.h:90: warning: declaration of ???bottom??? shadows a member of _this_" 'a' stands for argument Reviewed-by: jbache
Diffstat (limited to 'src/gui/painting/qmatrix.h')
-rw-r--r--src/gui/painting/qmatrix.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/painting/qmatrix.h b/src/gui/painting/qmatrix.h
index 983ebd5..8887f0e 100644
--- a/src/gui/painting/qmatrix.h
+++ b/src/gui/painting/qmatrix.h
@@ -129,13 +129,13 @@ private:
, _m22(1.)
, _dx(0.)
, _dy(0.) {}
- inline QMatrix(qreal m11, qreal m12, qreal m21, qreal m22, qreal dx, qreal dy, bool)
- : _m11(m11)
- , _m12(m12)
- , _m21(m21)
- , _m22(m22)
- , _dx(dx)
- , _dy(dy) {}
+ inline QMatrix(qreal am11, qreal am12, qreal am21, qreal am22, qreal adx, qreal ady, bool)
+ : _m11(am11)
+ , _m12(am12)
+ , _m21(am21)
+ , _m22(am22)
+ , _dx(adx)
+ , _dy(ady) {}
friend class QTransform;
qreal _m11, _m12;
qreal _m21, _m22;