diff options
| author | Marcel Krems <m.krems@software-vision.eu> | 2020-08-30 19:43:59 +0200 |
|---|---|---|
| committer | Marcel Krems <m.krems@software-vision.eu> | 2020-09-07 04:36:16 +0200 |
| commit | c93b91c766dc02efdb1955fb5a8a937c75108981 (patch) | |
| tree | 5b0cc2c665b1aed0ea230eacb32ecb98c5d8eff5 /src/gui | |
| parent | 4e2656a6d2de3be6cb98cbb98bbadf17815dae48 (diff) | |
Remove deprecated method QQuaternion::conjugate
Change-Id: If539e47618357ef329925033842f266447632e6f
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/math3d/qquaternion.cpp | 7 | ||||
| -rw-r--r-- | src/gui/math3d/qquaternion.h | 10 |
2 files changed, 0 insertions, 17 deletions
diff --git a/src/gui/math3d/qquaternion.cpp b/src/gui/math3d/qquaternion.cpp index 0d65b1f839..5e23996c15 100644 --- a/src/gui/math3d/qquaternion.cpp +++ b/src/gui/math3d/qquaternion.cpp @@ -315,13 +315,6 @@ void QQuaternion::normalize() */ /*! - \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: diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h index 12d62e8f50..cfe495530e 100644 --- a/src/gui/math3d/qquaternion.h +++ b/src/gui/math3d/qquaternion.h @@ -96,9 +96,6 @@ public: inline QQuaternion inverted() const; Q_REQUIRED_RESULT QQuaternion conjugated() const; -#if QT_DEPRECATED_SINCE(5, 5) - Q_REQUIRED_RESULT QT_DEPRECATED QQuaternion conjugate() const; -#endif QVector3D rotatedVector(const QVector3D& vector) const; @@ -220,13 +217,6 @@ 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) { wp += quaternion.wp; |