diff options
| author | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-10-01 16:38:16 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-10-01 16:38:16 (GMT) |
| commit | b828964113b157d36f8140c7a6fa649676af026a (patch) | |
| tree | fb1e7f882f460039b2f3c3a5656a59328426f38b /src/gui/math3d/qvector2d.h | |
| parent | 1596c59964f26a44a80bd5b41d519b497cdc6292 (diff) | |
| parent | 25f82aa1650c018a4dccde972642310d6ef4febc (diff) | |
| download | Qt-b828964113b157d36f8140c7a6fa649676af026a.zip Qt-b828964113b157d36f8140c7a6fa649676af026a.tar.gz Qt-b828964113b157d36f8140c7a6fa649676af026a.tar.bz2 | |
Merge branch 'mmfphonon' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into mmfphonon
Diffstat (limited to 'src/gui/math3d/qvector2d.h')
| -rw-r--r-- | src/gui/math3d/qvector2d.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/math3d/qvector2d.h b/src/gui/math3d/qvector2d.h index 570e864..cd9a12c 100644 --- a/src/gui/math3d/qvector2d.h +++ b/src/gui/math3d/qvector2d.h @@ -144,8 +144,8 @@ inline bool QVector2D::isNull() const inline qreal QVector2D::x() const { return qreal(xp); } inline qreal QVector2D::y() const { return qreal(yp); } -inline void QVector2D::setX(qreal x) { xp = x; } -inline void QVector2D::setY(qreal y) { yp = y; } +inline void QVector2D::setX(qreal aX) { xp = aX; } +inline void QVector2D::setY(qreal aY) { yp = aY; } inline QVector2D &QVector2D::operator+=(const QVector2D &vector) { |