diff options
| author | Sérgio Martins <sergio.martins@kdab.com> | 2015-05-03 20:03:00 +0100 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-05-13 01:08:45 +0000 |
| commit | 2a2e7ec20aba6064649d25b622ec34df7fb436a6 (patch) | |
| tree | 8e5c9b1c1e3ba7dc414f42782ac68de21f64addd /src/gui/math3d/qquaternion.h | |
| parent | 237e73df945ad9a82a658647a28706d04b63a6a6 (diff) | |
QQuaternion: Deprecate conjugate() and introduce conjugated()
Change-Id: I9aa835138e1e33448fea920f7a5ba99b26a95ebf
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/gui/math3d/qquaternion.h')
| -rw-r--r-- | src/gui/math3d/qquaternion.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h index 95ce5ce6d0..1fbd8b826c 100644 --- a/src/gui/math3d/qquaternion.h +++ b/src/gui/math3d/qquaternion.h @@ -88,7 +88,10 @@ public: inline QQuaternion inverted() const; - QQuaternion conjugate() const Q_REQUIRED_RESULT; + QQuaternion conjugated() const Q_REQUIRED_RESULT; +#if QT_DEPRECATED_SINCE(5, 5) + QT_DEPRECATED QQuaternion conjugate() const Q_REQUIRED_RESULT; +#endif QVector3D rotatedVector(const QVector3D& vector) const; @@ -196,11 +199,18 @@ inline QQuaternion QQuaternion::inverted() const return QQuaternion(0.0f, 0.0f, 0.0f, 0.0f); } -inline QQuaternion QQuaternion::conjugate() const +inline QQuaternion QQuaternion::conjugated() const { return QQuaternion(wp, -xp, -yp, -zp); } +#if QT_DEPRECATED_SINCE(5, 5) +inline QQuaternion QQuaternion::conjugate() const +{ + return conjugated(); +} +#endif + inline QQuaternion &QQuaternion::operator+=(const QQuaternion &quaternion) { xp += quaternion.xp; |