From 2a2e7ec20aba6064649d25b622ec34df7fb436a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Martins?= <sergio.martins@kdab.com>
Date: Sun, 3 May 2015 20:03:00 +0100
Subject: 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>
---
 src/gui/math3d/qquaternion.h | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/gui/math3d/qquaternion.h')

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;
-- 
cgit v1.2.3