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>

1 files changed, 11 insertions, 3 deletions

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,13 +301,21 @@ 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();
 }
 
 /*!