summaryrefslogtreecommitdiffstats
path: root/src/gui/math3d
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/math3d')
-rw-r--r--src/gui/math3d/qquaternion.h4
-rw-r--r--src/gui/math3d/qvector2d.h76
-rw-r--r--src/gui/math3d/qvector3d.h78
-rw-r--r--src/gui/math3d/qvector4d.h84
4 files changed, 121 insertions, 121 deletions
diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h
index f862e6174c..12d62e8f50 100644
--- a/src/gui/math3d/qquaternion.h
+++ b/src/gui/math3d/qquaternion.h
@@ -85,7 +85,7 @@ public:
void setZ(float z);
void setScalar(float scalar);
- Q_DECL_CONSTEXPR static inline float dotProduct(const QQuaternion &q1, const QQuaternion &q2);
+ constexpr static inline float dotProduct(const QQuaternion &q1, const QQuaternion &q2);
float length() const;
float lengthSquared() const;
@@ -197,7 +197,7 @@ inline void QQuaternion::setY(float aY) { yp = aY; }
inline void QQuaternion::setZ(float aZ) { zp = aZ; }
inline void QQuaternion::setScalar(float aScalar) { wp = aScalar; }
-Q_DECL_CONSTEXPR inline float QQuaternion::dotProduct(const QQuaternion &q1, const QQuaternion &q2)
+constexpr inline float QQuaternion::dotProduct(const QQuaternion &q1, const QQuaternion &q2)
{
return q1.wp * q2.wp + q1.xp * q2.xp + q1.yp * q2.yp + q1.zp * q2.zp;
}
diff --git a/src/gui/math3d/qvector2d.h b/src/gui/math3d/qvector2d.h
index 65ad2a3afd..983f236f84 100644
--- a/src/gui/math3d/qvector2d.h
+++ b/src/gui/math3d/qvector2d.h
@@ -56,11 +56,11 @@ class QVariant;
class Q_GUI_EXPORT QVector2D
{
public:
- Q_DECL_CONSTEXPR QVector2D();
+ constexpr QVector2D();
explicit QVector2D(Qt::Initialization) {}
- Q_DECL_CONSTEXPR QVector2D(float xpos, float ypos);
- Q_DECL_CONSTEXPR explicit QVector2D(const QPoint& point);
- Q_DECL_CONSTEXPR explicit QVector2D(const QPointF& point);
+ constexpr QVector2D(float xpos, float ypos);
+ constexpr explicit QVector2D(const QPoint& point);
+ constexpr explicit QVector2D(const QPointF& point);
#ifndef QT_NO_VECTOR3D
explicit QVector2D(const QVector3D& vector);
#endif
@@ -70,8 +70,8 @@ public:
bool isNull() const;
- Q_DECL_CONSTEXPR float x() const;
- Q_DECL_CONSTEXPR float y() const;
+ constexpr float x() const;
+ constexpr float y() const;
void setX(float x);
void setY(float y);
@@ -97,18 +97,18 @@ public:
static float dotProduct(const QVector2D& v1, const QVector2D& v2); //In Qt 6 convert to inline and constexpr
- Q_DECL_CONSTEXPR friend inline bool operator==(const QVector2D &v1, const QVector2D &v2);
- Q_DECL_CONSTEXPR friend inline bool operator!=(const QVector2D &v1, const QVector2D &v2);
- Q_DECL_CONSTEXPR friend inline const QVector2D operator+(const QVector2D &v1, const QVector2D &v2);
- Q_DECL_CONSTEXPR friend inline const QVector2D operator-(const QVector2D &v1, const QVector2D &v2);
- Q_DECL_CONSTEXPR friend inline const QVector2D operator*(float factor, const QVector2D &vector);
- Q_DECL_CONSTEXPR friend inline const QVector2D operator*(const QVector2D &vector, float factor);
- Q_DECL_CONSTEXPR friend inline const QVector2D operator*(const QVector2D &v1, const QVector2D &v2);
- Q_DECL_CONSTEXPR friend inline const QVector2D operator-(const QVector2D &vector);
- Q_DECL_CONSTEXPR friend inline const QVector2D operator/(const QVector2D &vector, float divisor);
- Q_DECL_CONSTEXPR friend inline const QVector2D operator/(const QVector2D &vector, const QVector2D &divisor);
+ constexpr friend inline bool operator==(const QVector2D &v1, const QVector2D &v2);
+ constexpr friend inline bool operator!=(const QVector2D &v1, const QVector2D &v2);
+ constexpr friend inline const QVector2D operator+(const QVector2D &v1, const QVector2D &v2);
+ constexpr friend inline const QVector2D operator-(const QVector2D &v1, const QVector2D &v2);
+ constexpr friend inline const QVector2D operator*(float factor, const QVector2D &vector);
+ constexpr friend inline const QVector2D operator*(const QVector2D &vector, float factor);
+ constexpr friend inline const QVector2D operator*(const QVector2D &v1, const QVector2D &v2);
+ constexpr friend inline const QVector2D operator-(const QVector2D &vector);
+ constexpr friend inline const QVector2D operator/(const QVector2D &vector, float divisor);
+ constexpr friend inline const QVector2D operator/(const QVector2D &vector, const QVector2D &divisor);
- Q_DECL_CONSTEXPR friend inline bool qFuzzyCompare(const QVector2D& v1, const QVector2D& v2);
+ constexpr friend inline bool qFuzzyCompare(const QVector2D& v1, const QVector2D& v2);
#ifndef QT_NO_VECTOR3D
QVector3D toVector3D() const;
@@ -117,8 +117,8 @@ public:
QVector4D toVector4D() const;
#endif
- Q_DECL_CONSTEXPR QPoint toPoint() const;
- Q_DECL_CONSTEXPR QPointF toPointF() const;
+ constexpr QPoint toPoint() const;
+ constexpr QPointF toPointF() const;
operator QVariant() const;
@@ -131,21 +131,21 @@ private:
Q_DECLARE_TYPEINFO(QVector2D, Q_PRIMITIVE_TYPE);
-Q_DECL_CONSTEXPR inline QVector2D::QVector2D() : v{0.0f, 0.0f} {}
+constexpr inline QVector2D::QVector2D() : v{0.0f, 0.0f} {}
-Q_DECL_CONSTEXPR inline QVector2D::QVector2D(float xpos, float ypos) : v{xpos, ypos} {}
+constexpr inline QVector2D::QVector2D(float xpos, float ypos) : v{xpos, ypos} {}
-Q_DECL_CONSTEXPR inline QVector2D::QVector2D(const QPoint& point) : v{float(point.x()), float(point.y())} {}
+constexpr inline QVector2D::QVector2D(const QPoint& point) : v{float(point.x()), float(point.y())} {}
-Q_DECL_CONSTEXPR inline QVector2D::QVector2D(const QPointF& point) : v{float(point.x()), float(point.y())} {}
+constexpr inline QVector2D::QVector2D(const QPointF& point) : v{float(point.x()), float(point.y())} {}
inline bool QVector2D::isNull() const
{
return qIsNull(v[0]) && qIsNull(v[1]);
}
-Q_DECL_CONSTEXPR inline float QVector2D::x() const { return v[0]; }
-Q_DECL_CONSTEXPR inline float QVector2D::y() const { return v[1]; }
+constexpr inline float QVector2D::x() const { return v[0]; }
+constexpr inline float QVector2D::y() const { return v[1]; }
inline void QVector2D::setX(float aX) { v[0] = aX; }
inline void QVector2D::setY(float aY) { v[1] = aY; }
@@ -207,68 +207,68 @@ inline QVector2D &QVector2D::operator/=(const QVector2D &vector)
QT_WARNING_PUSH
QT_WARNING_DISABLE_FLOAT_COMPARE
-Q_DECL_CONSTEXPR inline bool operator==(const QVector2D &v1, const QVector2D &v2)
+constexpr inline bool operator==(const QVector2D &v1, const QVector2D &v2)
{
return v1.v[0] == v2.v[0] && v1.v[1] == v2.v[1];
}
-Q_DECL_CONSTEXPR inline bool operator!=(const QVector2D &v1, const QVector2D &v2)
+constexpr inline bool operator!=(const QVector2D &v1, const QVector2D &v2)
{
return v1.v[0] != v2.v[0] || v1.v[1] != v2.v[1];
}
QT_WARNING_POP
-Q_DECL_CONSTEXPR inline const QVector2D operator+(const QVector2D &v1, const QVector2D &v2)
+constexpr inline const QVector2D operator+(const QVector2D &v1, const QVector2D &v2)
{
return QVector2D(v1.v[0] + v2.v[0], v1.v[1] + v2.v[1]);
}
-Q_DECL_CONSTEXPR inline const QVector2D operator-(const QVector2D &v1, const QVector2D &v2)
+constexpr inline const QVector2D operator-(const QVector2D &v1, const QVector2D &v2)
{
return QVector2D(v1.v[0] - v2.v[0], v1.v[1] - v2.v[1]);
}
-Q_DECL_CONSTEXPR inline const QVector2D operator*(float factor, const QVector2D &vector)
+constexpr inline const QVector2D operator*(float factor, const QVector2D &vector)
{
return QVector2D(vector.v[0] * factor, vector.v[1] * factor);
}
-Q_DECL_CONSTEXPR inline const QVector2D operator*(const QVector2D &vector, float factor)
+constexpr inline const QVector2D operator*(const QVector2D &vector, float factor)
{
return QVector2D(vector.v[0] * factor, vector.v[1] * factor);
}
-Q_DECL_CONSTEXPR inline const QVector2D operator*(const QVector2D &v1, const QVector2D &v2)
+constexpr inline const QVector2D operator*(const QVector2D &v1, const QVector2D &v2)
{
return QVector2D(v1.v[0] * v2.v[0], v1.v[1] * v2.v[1]);
}
-Q_DECL_CONSTEXPR inline const QVector2D operator-(const QVector2D &vector)
+constexpr inline const QVector2D operator-(const QVector2D &vector)
{
return QVector2D(-vector.v[0], -vector.v[1]);
}
-Q_DECL_CONSTEXPR inline const QVector2D operator/(const QVector2D &vector, float divisor)
+constexpr inline const QVector2D operator/(const QVector2D &vector, float divisor)
{
return QVector2D(vector.v[0] / divisor, vector.v[1] / divisor);
}
-Q_DECL_CONSTEXPR inline const QVector2D operator/(const QVector2D &vector, const QVector2D &divisor)
+constexpr inline const QVector2D operator/(const QVector2D &vector, const QVector2D &divisor)
{
return QVector2D(vector.v[0] / divisor.v[0], vector.v[1] / divisor.v[1]);
}
-Q_DECL_CONSTEXPR inline bool qFuzzyCompare(const QVector2D& v1, const QVector2D& v2)
+constexpr inline bool qFuzzyCompare(const QVector2D& v1, const QVector2D& v2)
{
return qFuzzyCompare(v1.v[0], v2.v[0]) && qFuzzyCompare(v1.v[1], v2.v[1]);
}
-Q_DECL_CONSTEXPR inline QPoint QVector2D::toPoint() const
+constexpr inline QPoint QVector2D::toPoint() const
{
return QPoint(qRound(v[0]), qRound(v[1]));
}
-Q_DECL_CONSTEXPR inline QPointF QVector2D::toPointF() const
+constexpr inline QPointF QVector2D::toPointF() const
{
return QPointF(qreal(v[0]), qreal(v[1]));
}
diff --git a/src/gui/math3d/qvector3d.h b/src/gui/math3d/qvector3d.h
index 9eb2e7e7e6..ecfdf82239 100644
--- a/src/gui/math3d/qvector3d.h
+++ b/src/gui/math3d/qvector3d.h
@@ -57,12 +57,12 @@ class QRect;
class Q_GUI_EXPORT QVector3D
{
public:
- Q_DECL_CONSTEXPR QVector3D();
+ constexpr QVector3D();
explicit QVector3D(Qt::Initialization) {}
- Q_DECL_CONSTEXPR QVector3D(float xpos, float ypos, float zpos) : v{xpos, ypos, zpos} {}
+ constexpr QVector3D(float xpos, float ypos, float zpos) : v{xpos, ypos, zpos} {}
- Q_DECL_CONSTEXPR explicit QVector3D(const QPoint& point);
- Q_DECL_CONSTEXPR explicit QVector3D(const QPointF& point);
+ constexpr explicit QVector3D(const QPoint& point);
+ constexpr explicit QVector3D(const QPointF& point);
#ifndef QT_NO_VECTOR2D
QVector3D(const QVector2D& vector);
QVector3D(const QVector2D& vector, float zpos);
@@ -73,9 +73,9 @@ public:
bool isNull() const;
- Q_DECL_CONSTEXPR float x() const;
- Q_DECL_CONSTEXPR float y() const;
- Q_DECL_CONSTEXPR float z() const;
+ constexpr float x() const;
+ constexpr float y() const;
+ constexpr float z() const;
void setX(float x);
void setY(float y);
@@ -112,18 +112,18 @@ public:
float distanceToPlane(const QVector3D& plane1, const QVector3D& plane2, const QVector3D& plane3) const;
float distanceToLine(const QVector3D& point, const QVector3D& direction) const;
- Q_DECL_CONSTEXPR friend inline bool operator==(const QVector3D &v1, const QVector3D &v2);
- Q_DECL_CONSTEXPR friend inline bool operator!=(const QVector3D &v1, const QVector3D &v2);
- Q_DECL_CONSTEXPR friend inline const QVector3D operator+(const QVector3D &v1, const QVector3D &v2);
- Q_DECL_CONSTEXPR friend inline const QVector3D operator-(const QVector3D &v1, const QVector3D &v2);
- Q_DECL_CONSTEXPR friend inline const QVector3D operator*(float factor, const QVector3D &vector);
- Q_DECL_CONSTEXPR friend inline const QVector3D operator*(const QVector3D &vector, float factor);
- Q_DECL_CONSTEXPR friend const QVector3D operator*(const QVector3D &v1, const QVector3D& v2);
- Q_DECL_CONSTEXPR friend inline const QVector3D operator-(const QVector3D &vector);
- Q_DECL_CONSTEXPR friend inline const QVector3D operator/(const QVector3D &vector, float divisor);
- Q_DECL_CONSTEXPR friend inline const QVector3D operator/(const QVector3D &vector, const QVector3D &divisor);
+ constexpr friend inline bool operator==(const QVector3D &v1, const QVector3D &v2);
+ constexpr friend inline bool operator!=(const QVector3D &v1, const QVector3D &v2);
+ constexpr friend inline const QVector3D operator+(const QVector3D &v1, const QVector3D &v2);
+ constexpr friend inline const QVector3D operator-(const QVector3D &v1, const QVector3D &v2);
+ constexpr friend inline const QVector3D operator*(float factor, const QVector3D &vector);
+ constexpr friend inline const QVector3D operator*(const QVector3D &vector, float factor);
+ constexpr friend const QVector3D operator*(const QVector3D &v1, const QVector3D& v2);
+ constexpr friend inline const QVector3D operator-(const QVector3D &vector);
+ constexpr friend inline const QVector3D operator/(const QVector3D &vector, float divisor);
+ constexpr friend inline const QVector3D operator/(const QVector3D &vector, const QVector3D &divisor);
- Q_DECL_CONSTEXPR friend inline bool qFuzzyCompare(const QVector3D& v1, const QVector3D& v2);
+ constexpr friend inline bool qFuzzyCompare(const QVector3D& v1, const QVector3D& v2);
#ifndef QT_NO_VECTOR2D
QVector2D toVector2D() const;
@@ -132,8 +132,8 @@ public:
QVector4D toVector4D() const;
#endif
- Q_DECL_CONSTEXPR QPoint toPoint() const;
- Q_DECL_CONSTEXPR QPointF toPointF() const;
+ constexpr QPoint toPoint() const;
+ constexpr QPointF toPointF() const;
operator QVariant() const;
@@ -150,20 +150,20 @@ private:
Q_DECLARE_TYPEINFO(QVector3D, Q_PRIMITIVE_TYPE);
-Q_DECL_CONSTEXPR inline QVector3D::QVector3D() : v{0.0f, 0.0f, 0.0f} {}
+constexpr inline QVector3D::QVector3D() : v{0.0f, 0.0f, 0.0f} {}
-Q_DECL_CONSTEXPR inline QVector3D::QVector3D(const QPoint& point) : v{float(point.x()), float(point.y()), float(0.0f)} {}
+constexpr inline QVector3D::QVector3D(const QPoint& point) : v{float(point.x()), float(point.y()), float(0.0f)} {}
-Q_DECL_CONSTEXPR inline QVector3D::QVector3D(const QPointF& point) : v{float(point.x()), float(point.y()), 0.0f} {}
+constexpr inline QVector3D::QVector3D(const QPointF& point) : v{float(point.x()), float(point.y()), 0.0f} {}
inline bool QVector3D::isNull() const
{
return qIsNull(v[0]) && qIsNull(v[1]) && qIsNull(v[2]);
}
-Q_DECL_CONSTEXPR inline float QVector3D::x() const { return v[0]; }
-Q_DECL_CONSTEXPR inline float QVector3D::y() const { return v[1]; }
-Q_DECL_CONSTEXPR inline float QVector3D::z() const { return v[2]; }
+constexpr inline float QVector3D::x() const { return v[0]; }
+constexpr inline float QVector3D::y() const { return v[1]; }
+constexpr inline float QVector3D::z() const { return v[2]; }
inline void QVector3D::setX(float aX) { v[0] = aX; }
inline void QVector3D::setY(float aY) { v[1] = aY; }
@@ -232,70 +232,70 @@ inline QVector3D &QVector3D::operator/=(const QVector3D &vector)
QT_WARNING_PUSH
QT_WARNING_DISABLE_FLOAT_COMPARE
-Q_DECL_CONSTEXPR inline bool operator==(const QVector3D &v1, const QVector3D &v2)
+constexpr inline bool operator==(const QVector3D &v1, const QVector3D &v2)
{
return v1.v[0] == v2.v[0] && v1.v[1] == v2.v[1] && v1.v[2] == v2.v[2];
}
-Q_DECL_CONSTEXPR inline bool operator!=(const QVector3D &v1, const QVector3D &v2)
+constexpr inline bool operator!=(const QVector3D &v1, const QVector3D &v2)
{
return v1.v[0] != v2.v[0] || v1.v[1] != v2.v[1] || v1.v[2] != v2.v[2];
}
QT_WARNING_POP
-Q_DECL_CONSTEXPR inline const QVector3D operator+(const QVector3D &v1, const QVector3D &v2)
+constexpr inline const QVector3D operator+(const QVector3D &v1, const QVector3D &v2)
{
return QVector3D(v1.v[0] + v2.v[0], v1.v[1] + v2.v[1], v1.v[2] + v2.v[2]);
}
-Q_DECL_CONSTEXPR inline const QVector3D operator-(const QVector3D &v1, const QVector3D &v2)
+constexpr inline const QVector3D operator-(const QVector3D &v1, const QVector3D &v2)
{
return QVector3D(v1.v[0] - v2.v[0], v1.v[1] - v2.v[1], v1.v[2] - v2.v[2]);
}
-Q_DECL_CONSTEXPR inline const QVector3D operator*(float factor, const QVector3D &vector)
+constexpr inline const QVector3D operator*(float factor, const QVector3D &vector)
{
return QVector3D(vector.v[0] * factor, vector.v[1] * factor, vector.v[2] * factor);
}
-Q_DECL_CONSTEXPR inline const QVector3D operator*(const QVector3D &vector, float factor)
+constexpr inline const QVector3D operator*(const QVector3D &vector, float factor)
{
return QVector3D(vector.v[0] * factor, vector.v[1] * factor, vector.v[2] * factor);
}
-Q_DECL_CONSTEXPR inline const QVector3D operator*(const QVector3D &v1, const QVector3D& v2)
+constexpr inline const QVector3D operator*(const QVector3D &v1, const QVector3D& v2)
{
return QVector3D(v1.v[0] * v2.v[0], v1.v[1] * v2.v[1], v1.v[2] * v2.v[2]);
}
-Q_DECL_CONSTEXPR inline const QVector3D operator-(const QVector3D &vector)
+constexpr inline const QVector3D operator-(const QVector3D &vector)
{
return QVector3D(-vector.v[0], -vector.v[1], -vector.v[2]);
}
-Q_DECL_CONSTEXPR inline const QVector3D operator/(const QVector3D &vector, float divisor)
+constexpr inline const QVector3D operator/(const QVector3D &vector, float divisor)
{
return QVector3D(vector.v[0] / divisor, vector.v[1] / divisor, vector.v[2] / divisor);
}
-Q_DECL_CONSTEXPR inline const QVector3D operator/(const QVector3D &vector, const QVector3D &divisor)
+constexpr inline const QVector3D operator/(const QVector3D &vector, const QVector3D &divisor)
{
return QVector3D(vector.v[0] / divisor.v[0], vector.v[1] / divisor.v[1], vector.v[2] / divisor.v[2]);
}
-Q_DECL_CONSTEXPR inline bool qFuzzyCompare(const QVector3D& v1, const QVector3D& v2)
+constexpr inline bool qFuzzyCompare(const QVector3D& v1, const QVector3D& v2)
{
return qFuzzyCompare(v1.v[0], v2.v[0]) &&
qFuzzyCompare(v1.v[1], v2.v[1]) &&
qFuzzyCompare(v1.v[2], v2.v[2]);
}
-Q_DECL_CONSTEXPR inline QPoint QVector3D::toPoint() const
+constexpr inline QPoint QVector3D::toPoint() const
{
return QPoint(qRound(v[0]), qRound(v[1]));
}
-Q_DECL_CONSTEXPR inline QPointF QVector3D::toPointF() const
+constexpr inline QPointF QVector3D::toPointF() const
{
return QPointF(qreal(v[0]), qreal(v[1]));
}
diff --git a/src/gui/math3d/qvector4d.h b/src/gui/math3d/qvector4d.h
index 495a0b7e23..6f6ec213b9 100644
--- a/src/gui/math3d/qvector4d.h
+++ b/src/gui/math3d/qvector4d.h
@@ -56,11 +56,11 @@ class QVector3D;
class Q_GUI_EXPORT QVector4D
{
public:
- Q_DECL_CONSTEXPR QVector4D();
+ constexpr QVector4D();
explicit QVector4D(Qt::Initialization) {}
- Q_DECL_CONSTEXPR QVector4D(float xpos, float ypos, float zpos, float wpos);
- Q_DECL_CONSTEXPR explicit QVector4D(const QPoint& point);
- Q_DECL_CONSTEXPR explicit QVector4D(const QPointF& point);
+ constexpr QVector4D(float xpos, float ypos, float zpos, float wpos);
+ constexpr explicit QVector4D(const QPoint& point);
+ constexpr explicit QVector4D(const QPointF& point);
#ifndef QT_NO_VECTOR2D
QVector4D(const QVector2D& vector);
QVector4D(const QVector2D& vector, float zpos, float wpos);
@@ -72,10 +72,10 @@ public:
bool isNull() const;
- Q_DECL_CONSTEXPR float x() const;
- Q_DECL_CONSTEXPR float y() const;
- Q_DECL_CONSTEXPR float z() const;
- Q_DECL_CONSTEXPR float w() const;
+ constexpr float x() const;
+ constexpr float y() const;
+ constexpr float z() const;
+ constexpr float w() const;
void setX(float x);
void setY(float y);
@@ -100,18 +100,18 @@ public:
static float dotProduct(const QVector4D& v1, const QVector4D& v2); //In Qt 6 convert to inline and constexpr
- Q_DECL_CONSTEXPR friend inline bool operator==(const QVector4D &v1, const QVector4D &v2);
- Q_DECL_CONSTEXPR friend inline bool operator!=(const QVector4D &v1, const QVector4D &v2);
- Q_DECL_CONSTEXPR friend inline const QVector4D operator+(const QVector4D &v1, const QVector4D &v2);
- Q_DECL_CONSTEXPR friend inline const QVector4D operator-(const QVector4D &v1, const QVector4D &v2);
- Q_DECL_CONSTEXPR friend inline const QVector4D operator*(float factor, const QVector4D &vector);
- Q_DECL_CONSTEXPR friend inline const QVector4D operator*(const QVector4D &vector, float factor);
- Q_DECL_CONSTEXPR friend inline const QVector4D operator*(const QVector4D &v1, const QVector4D& v2);
- Q_DECL_CONSTEXPR friend inline const QVector4D operator-(const QVector4D &vector);
- Q_DECL_CONSTEXPR friend inline const QVector4D operator/(const QVector4D &vector, float divisor);
- Q_DECL_CONSTEXPR friend inline const QVector4D operator/(const QVector4D &vector, const QVector4D &divisor);
+ constexpr friend inline bool operator==(const QVector4D &v1, const QVector4D &v2);
+ constexpr friend inline bool operator!=(const QVector4D &v1, const QVector4D &v2);
+ constexpr friend inline const QVector4D operator+(const QVector4D &v1, const QVector4D &v2);
+ constexpr friend inline const QVector4D operator-(const QVector4D &v1, const QVector4D &v2);
+ constexpr friend inline const QVector4D operator*(float factor, const QVector4D &vector);
+ constexpr friend inline const QVector4D operator*(const QVector4D &vector, float factor);
+ constexpr friend inline const QVector4D operator*(const QVector4D &v1, const QVector4D& v2);
+ constexpr friend inline const QVector4D operator-(const QVector4D &vector);
+ constexpr friend inline const QVector4D operator/(const QVector4D &vector, float divisor);
+ constexpr friend inline const QVector4D operator/(const QVector4D &vector, const QVector4D &divisor);
- Q_DECL_CONSTEXPR friend inline bool qFuzzyCompare(const QVector4D& v1, const QVector4D& v2);
+ constexpr friend inline bool qFuzzyCompare(const QVector4D& v1, const QVector4D& v2);
#ifndef QT_NO_VECTOR2D
QVector2D toVector2D() const;
@@ -122,8 +122,8 @@ public:
QVector3D toVector3DAffine() const;
#endif
- Q_DECL_CONSTEXPR QPoint toPoint() const;
- Q_DECL_CONSTEXPR QPointF toPointF() const;
+ constexpr QPoint toPoint() const;
+ constexpr QPointF toPointF() const;
operator QVariant() const;
@@ -140,23 +140,23 @@ private:
Q_DECLARE_TYPEINFO(QVector4D, Q_PRIMITIVE_TYPE);
-Q_DECL_CONSTEXPR inline QVector4D::QVector4D() : v{0.0f, 0.0f, 0.0f, 0.0f} {}
+constexpr inline QVector4D::QVector4D() : v{0.0f, 0.0f, 0.0f, 0.0f} {}
-Q_DECL_CONSTEXPR inline QVector4D::QVector4D(float xpos, float ypos, float zpos, float wpos) : v{xpos, ypos, zpos, wpos} {}
+constexpr inline QVector4D::QVector4D(float xpos, float ypos, float zpos, float wpos) : v{xpos, ypos, zpos, wpos} {}
-Q_DECL_CONSTEXPR inline QVector4D::QVector4D(const QPoint& point) : v{float(point.x()), float(point.y()), 0.0f, 0.0f} {}
+constexpr inline QVector4D::QVector4D(const QPoint& point) : v{float(point.x()), float(point.y()), 0.0f, 0.0f} {}
-Q_DECL_CONSTEXPR inline QVector4D::QVector4D(const QPointF& point) : v{float(point.x()), float(point.y()), 0.0f, 0.0f} {}
+constexpr inline QVector4D::QVector4D(const QPointF& point) : v{float(point.x()), float(point.y()), 0.0f, 0.0f} {}
inline bool QVector4D::isNull() const
{
return qIsNull(v[0]) && qIsNull(v[1]) && qIsNull(v[2]) && qIsNull(v[3]);
}
-Q_DECL_CONSTEXPR inline float QVector4D::x() const { return v[0]; }
-Q_DECL_CONSTEXPR inline float QVector4D::y() const { return v[1]; }
-Q_DECL_CONSTEXPR inline float QVector4D::z() const { return v[2]; }
-Q_DECL_CONSTEXPR inline float QVector4D::w() const { return v[3]; }
+constexpr inline float QVector4D::x() const { return v[0]; }
+constexpr inline float QVector4D::y() const { return v[1]; }
+constexpr inline float QVector4D::z() const { return v[2]; }
+constexpr inline float QVector4D::w() const { return v[3]; }
inline void QVector4D::setX(float aX) { v[0] = aX; }
inline void QVector4D::setY(float aY) { v[1] = aY; }
@@ -232,58 +232,58 @@ inline QVector4D &QVector4D::operator/=(const QVector4D &vector)
QT_WARNING_PUSH
QT_WARNING_DISABLE_FLOAT_COMPARE
-Q_DECL_CONSTEXPR inline bool operator==(const QVector4D &v1, const QVector4D &v2)
+constexpr inline bool operator==(const QVector4D &v1, const QVector4D &v2)
{
return v1.v[0] == v2.v[0] && v1.v[1] == v2.v[1] && v1.v[2] == v2.v[2] && v1.v[3] == v2.v[3];
}
-Q_DECL_CONSTEXPR inline bool operator!=(const QVector4D &v1, const QVector4D &v2)
+constexpr inline bool operator!=(const QVector4D &v1, const QVector4D &v2)
{
return v1.v[0] != v2.v[0] || v1.v[1] != v2.v[1] || v1.v[2] != v2.v[2] || v1.v[3] != v2.v[3];
}
QT_WARNING_POP
-Q_DECL_CONSTEXPR inline const QVector4D operator+(const QVector4D &v1, const QVector4D &v2)
+constexpr inline const QVector4D operator+(const QVector4D &v1, const QVector4D &v2)
{
return QVector4D(v1.v[0] + v2.v[0], v1.v[1] + v2.v[1], v1.v[2] + v2.v[2], v1.v[3] + v2.v[3]);
}
-Q_DECL_CONSTEXPR inline const QVector4D operator-(const QVector4D &v1, const QVector4D &v2)
+constexpr inline const QVector4D operator-(const QVector4D &v1, const QVector4D &v2)
{
return QVector4D(v1.v[0] - v2.v[0], v1.v[1] - v2.v[1], v1.v[2] - v2.v[2], v1.v[3] - v2.v[3]);
}
-Q_DECL_CONSTEXPR inline const QVector4D operator*(float factor, const QVector4D &vector)
+constexpr inline const QVector4D operator*(float factor, const QVector4D &vector)
{
return QVector4D(vector.v[0] * factor, vector.v[1] * factor, vector.v[2] * factor, vector.v[3] * factor);
}
-Q_DECL_CONSTEXPR inline const QVector4D operator*(const QVector4D &vector, float factor)
+constexpr inline const QVector4D operator*(const QVector4D &vector, float factor)
{
return QVector4D(vector.v[0] * factor, vector.v[1] * factor, vector.v[2] * factor, vector.v[3] * factor);
}
-Q_DECL_CONSTEXPR inline const QVector4D operator*(const QVector4D &v1, const QVector4D& v2)
+constexpr inline const QVector4D operator*(const QVector4D &v1, const QVector4D& v2)
{
return QVector4D(v1.v[0] * v2.v[0], v1.v[1] * v2.v[1], v1.v[2] * v2.v[2], v1.v[3] * v2.v[3]);
}
-Q_DECL_CONSTEXPR inline const QVector4D operator-(const QVector4D &vector)
+constexpr inline const QVector4D operator-(const QVector4D &vector)
{
return QVector4D(-vector.v[0], -vector.v[1], -vector.v[2], -vector.v[3]);
}
-Q_DECL_CONSTEXPR inline const QVector4D operator/(const QVector4D &vector, float divisor)
+constexpr inline const QVector4D operator/(const QVector4D &vector, float divisor)
{
return QVector4D(vector.v[0] / divisor, vector.v[1] / divisor, vector.v[2] / divisor, vector.v[3] / divisor);
}
-Q_DECL_CONSTEXPR inline const QVector4D operator/(const QVector4D &vector, const QVector4D &divisor)
+constexpr inline const QVector4D operator/(const QVector4D &vector, const QVector4D &divisor)
{
return QVector4D(vector.v[0] / divisor.v[0], vector.v[1] / divisor.v[1], vector.v[2] / divisor.v[2], vector.v[3] / divisor.v[3]);
}
-Q_DECL_CONSTEXPR inline bool qFuzzyCompare(const QVector4D& v1, const QVector4D& v2)
+constexpr inline bool qFuzzyCompare(const QVector4D& v1, const QVector4D& v2)
{
return qFuzzyCompare(v1.v[0], v2.v[0]) &&
qFuzzyCompare(v1.v[1], v2.v[1]) &&
@@ -291,12 +291,12 @@ Q_DECL_CONSTEXPR inline bool qFuzzyCompare(const QVector4D& v1, const QVector4D&
qFuzzyCompare(v1.v[3], v2.v[3]);
}
-Q_DECL_CONSTEXPR inline QPoint QVector4D::toPoint() const
+constexpr inline QPoint QVector4D::toPoint() const
{
return QPoint(qRound(v[0]), qRound(v[1]));
}
-Q_DECL_CONSTEXPR inline QPointF QVector4D::toPointF() const
+constexpr inline QPointF QVector4D::toPointF() const
{
return QPointF(qreal(v[0]), qreal(v[1]));
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 06:01:16 +0000