From bdf6f7f4d38f7407dd6b11c3af55d3ef41a0fb2b Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Mon, 15 Jan 2024 13:03:49 +0100 Subject: [PATCH] QQuaterion: fix formatting Fix indentation, split too long lines. Amends f9f1272e7c438b79591032877f2b386af8085c3f Found in 6.7 API Review Change-Id: I3e9e3647afbe1a49fe78258177aff5cb878ce030 Reviewed-by: Volker Hilsheimer (cherry picked from commit 5e49fa2739bd43e919863b343821c22b3d583afb) Reviewed-by: Qt Cherry-pick Bot --- src/gui/math3d/qquaternion.h | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h index e6456e6e27d..7cfbd9b818d 100644 --- a/src/gui/math3d/qquaternion.h +++ b/src/gui/math3d/qquaternion.h @@ -57,7 +57,7 @@ public: QT7_ONLY(Q_GUI_EXPORT) float lengthSquared() const; [[nodiscard]] QT7_ONLY(Q_GUI_EXPORT) QQuaternion normalized() const; - QT7_ONLY(Q_GUI_EXPORT) void normalize(); + QT7_ONLY(Q_GUI_EXPORT) void normalize(); constexpr QQuaternion inverted() const noexcept; @@ -104,7 +104,8 @@ QT_WARNING_POP QT7_ONLY(Q_GUI_EXPORT) static QQuaternion fromAxisAndAngle(const QVector3D &axis, float angle); #endif QT7_ONLY(Q_GUI_EXPORT) void getAxisAndAngle(float *x, float *y, float *z, float *angle) const; - QT7_ONLY(Q_GUI_EXPORT) static QQuaternion fromAxisAndAngle(float x, float y, float z, float angle); + QT7_ONLY(Q_GUI_EXPORT) static QQuaternion fromAxisAndAngle(float x, float y, float z, + float angle); #ifndef QT_NO_VECTOR3D inline QVector3D toEulerAngles() const; @@ -118,16 +119,21 @@ QT_WARNING_POP #ifndef QT_NO_VECTOR3D QT7_ONLY(Q_GUI_EXPORT) void getAxes(QVector3D *xAxis, QVector3D *yAxis, QVector3D *zAxis) const; - QT7_ONLY(Q_GUI_EXPORT) static QQuaternion fromAxes(const QVector3D &xAxis, const QVector3D &yAxis, + QT7_ONLY(Q_GUI_EXPORT) static QQuaternion fromAxes(const QVector3D &xAxis, + const QVector3D &yAxis, const QVector3D &zAxis); - QT7_ONLY(Q_GUI_EXPORT) static QQuaternion fromDirection(const QVector3D &direction, const QVector3D &up); + QT7_ONLY(Q_GUI_EXPORT) static QQuaternion fromDirection(const QVector3D &direction, + const QVector3D &up); - QT7_ONLY(Q_GUI_EXPORT) static QQuaternion rotationTo(const QVector3D &from, const QVector3D &to); + QT7_ONLY(Q_GUI_EXPORT) static QQuaternion rotationTo(const QVector3D &from, + const QVector3D &to); #endif - QT7_ONLY(Q_GUI_EXPORT) static QQuaternion slerp(const QQuaternion &q1, const QQuaternion &q2, float t); - QT7_ONLY(Q_GUI_EXPORT) static QQuaternion nlerp(const QQuaternion &q1, const QQuaternion &q2, float t); + QT7_ONLY(Q_GUI_EXPORT) static QQuaternion slerp(const QQuaternion &q1, const QQuaternion &q2, + float t); + QT7_ONLY(Q_GUI_EXPORT) static QQuaternion nlerp(const QQuaternion &q1, const QQuaternion &q2, + float t); private: float wp, xp, yp, zp;