diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-09-30 13:11:39 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-09-30 13:11:39 (GMT) |
| commit | 7c33e0f95789af1f6c091db89581f8a26b10682d (patch) | |
| tree | cb8faa2ab6ce19c85a8c0c90dc852db08375868e /src/gui/math3d/qvector3d.h | |
| parent | da935e9df4c63490a7d2a716236f1e781c2d75a6 (diff) | |
| parent | c3ef2d3a6d9a6e35b05cbd8f370630d5dd85415e (diff) | |
| download | Qt-7c33e0f95789af1f6c091db89581f8a26b10682d.zip Qt-7c33e0f95789af1f6c091db89581f8a26b10682d.tar.gz Qt-7c33e0f95789af1f6c091db89581f8a26b10682d.tar.bz2 | |
Merge commit 'origin/4.6' into mmfphonon
Diffstat (limited to 'src/gui/math3d/qvector3d.h')
| -rw-r--r-- | src/gui/math3d/qvector3d.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/math3d/qvector3d.h b/src/gui/math3d/qvector3d.h index 1291c96..60bd693 100644 --- a/src/gui/math3d/qvector3d.h +++ b/src/gui/math3d/qvector3d.h @@ -160,9 +160,9 @@ inline qreal QVector3D::x() const { return qreal(xp); } inline qreal QVector3D::y() const { return qreal(yp); } inline qreal QVector3D::z() const { return qreal(zp); } -inline void QVector3D::setX(qreal x) { xp = x; } -inline void QVector3D::setY(qreal y) { yp = y; } -inline void QVector3D::setZ(qreal z) { zp = z; } +inline void QVector3D::setX(qreal aX) { xp = aX; } +inline void QVector3D::setY(qreal aY) { yp = aY; } +inline void QVector3D::setZ(qreal aZ) { zp = aZ; } inline QVector3D &QVector3D::operator+=(const QVector3D &vector) { |