From 2a2e7ec20aba6064649d25b622ec34df7fb436a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Martins?= Date: Sun, 3 May 2015 20:03:00 +0100 Subject: QQuaternion: Deprecate conjugate() and introduce conjugated() Change-Id: I9aa835138e1e33448fea920f7a5ba99b26a95ebf Reviewed-by: Thiago Macieira Reviewed-by: Konstantin Ritt Reviewed-by: Giuseppe D'Angelo Reviewed-by: Sean Harmer Reviewed-by: Marc Mutz --- src/gui/math3d/qquaternion.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/gui/math3d/qquaternion.cpp') diff --git a/src/gui/math3d/qquaternion.cpp b/src/gui/math3d/qquaternion.cpp index 4b35ee4e79..0e73f79ac0 100644 --- a/src/gui/math3d/qquaternion.cpp +++ b/src/gui/math3d/qquaternion.cpp @@ -301,12 +301,20 @@ void QQuaternion::normalize() */ /*! - \fn QQuaternion QQuaternion::conjugate() const + \fn QQuaternion QQuaternion::conjugated() const + \since 5.5 Returns the conjugate of this quaternion, which is (-x, -y, -z, scalar). */ +/*! + \fn QQuaternion QQuaternion::conjugate() const + \obsolete + + Use conjugated() instead. +*/ + /*! Rotates \a vector with this quaternion to produce a new vector in 3D space. The following code: @@ -318,12 +326,12 @@ void QQuaternion::normalize() is equivalent to the following: \code - QVector3D result = (q * QQuaternion(0, vector) * q.conjugate()).vector(); + QVector3D result = (q * QQuaternion(0, vector) * q.conjugated()).vector(); \endcode */ QVector3D QQuaternion::rotatedVector(const QVector3D& vector) const { - return (*this * QQuaternion(0, vector) * conjugate()).vector(); + return (*this * QQuaternion(0, vector) * conjugated()).vector(); } /*! -- cgit v1.2.3