diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-23 10:09:42 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-25 07:10:45 +0200 |
| commit | c2be9180b7430221e9136afb1a8c2a752ac2710f (patch) | |
| tree | 5b390c53f4744c7bd4faeaf4d3a12d77ce3c0ba7 /src/gui/math3d | |
| parent | 31a1b3280cf076fcdb45a658d0140af3737be138 (diff) | |
Replace Q_REQUIRED_RESULT with [[nodiscard]]
It was already used many places directly making the code inconsistent.
Change-Id: I3b14bc6c333640fb3ba33c71eba97e78c973e44b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/gui/math3d')
| -rw-r--r-- | src/gui/math3d/qgenericmatrix.h | 2 | ||||
| -rw-r--r-- | src/gui/math3d/qquaternion.h | 4 | ||||
| -rw-r--r-- | src/gui/math3d/qvector2d.h | 2 | ||||
| -rw-r--r-- | src/gui/math3d/qvector4d.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/math3d/qgenericmatrix.h b/src/gui/math3d/qgenericmatrix.h index 1381014a04..9d8869ff3a 100644 --- a/src/gui/math3d/qgenericmatrix.h +++ b/src/gui/math3d/qgenericmatrix.h @@ -64,7 +64,7 @@ public: void fill(T value); - Q_REQUIRED_RESULT QGenericMatrix<M, N, T> transposed() const; + [[nodiscard]] QGenericMatrix<M, N, T> transposed() const; QGenericMatrix<N, M, T>& operator+=(const QGenericMatrix<N, M, T>& other); QGenericMatrix<N, M, T>& operator-=(const QGenericMatrix<N, M, T>& other); diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h index cfe495530e..be8951145d 100644 --- a/src/gui/math3d/qquaternion.h +++ b/src/gui/math3d/qquaternion.h @@ -90,12 +90,12 @@ public: float length() const; float lengthSquared() const; - Q_REQUIRED_RESULT QQuaternion normalized() const; + [[nodiscard]] QQuaternion normalized() const; void normalize(); inline QQuaternion inverted() const; - Q_REQUIRED_RESULT QQuaternion conjugated() const; + [[nodiscard]] QQuaternion conjugated() const; QVector3D rotatedVector(const QVector3D& vector) const; diff --git a/src/gui/math3d/qvector2d.h b/src/gui/math3d/qvector2d.h index 983f236f84..18d6d03b7d 100644 --- a/src/gui/math3d/qvector2d.h +++ b/src/gui/math3d/qvector2d.h @@ -82,7 +82,7 @@ public: float length() const; float lengthSquared() const; //In Qt 6 convert to inline and constexpr - Q_REQUIRED_RESULT QVector2D normalized() const; + [[nodiscard]] QVector2D normalized() const; void normalize(); float distanceToPoint(const QVector2D &point) const; diff --git a/src/gui/math3d/qvector4d.h b/src/gui/math3d/qvector4d.h index 6f6ec213b9..4165ec25ef 100644 --- a/src/gui/math3d/qvector4d.h +++ b/src/gui/math3d/qvector4d.h @@ -88,7 +88,7 @@ public: float length() const; float lengthSquared() const; //In Qt 6 convert to inline and constexpr - Q_REQUIRED_RESULT QVector4D normalized() const; + [[nodiscard]] QVector4D normalized() const; void normalize(); QVector4D &operator+=(const QVector4D &vector); |