summaryrefslogtreecommitdiffstats
path: root/src/animation/frontend/qkeyframe.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/animation/frontend/qkeyframe.h')
-rw-r--r--src/animation/frontend/qkeyframe.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/animation/frontend/qkeyframe.h b/src/animation/frontend/qkeyframe.h
index 87e2812b2..65ff5c4c4 100644
--- a/src/animation/frontend/qkeyframe.h
+++ b/src/animation/frontend/qkeyframe.h
@@ -56,7 +56,7 @@ public:
BezierInterpolation
};
- Q_DECL_CONSTEXPR QKeyFrame() Q_DECL_NOTHROW
+ constexpr QKeyFrame() noexcept
: m_coordinates()
, m_leftControlPoint()
, m_rightControlPoint()
@@ -64,7 +64,7 @@ public:
{
}
- Q_DECL_CONSTEXPR explicit QKeyFrame(QVector2D coords) Q_DECL_NOTHROW
+ constexpr explicit QKeyFrame(QVector2D coords) noexcept
: m_coordinates(coords)
, m_leftControlPoint()
, m_rightControlPoint()
@@ -72,9 +72,9 @@ public:
{
}
- Q_DECL_CONSTEXPR explicit QKeyFrame(QVector2D coords,
+ constexpr explicit QKeyFrame(QVector2D coords,
QVector2D lh,
- QVector2D rh) Q_DECL_NOTHROW
+ QVector2D rh) noexcept
: m_coordinates(coords)
, m_leftControlPoint(lh)
, m_rightControlPoint(rh)
@@ -82,48 +82,48 @@ public:
{
}
- void setCoordinates(QVector2D coords) Q_DECL_NOTHROW
+ void setCoordinates(QVector2D coords) noexcept
{
m_coordinates = coords;
}
- Q_DECL_CONSTEXPR QVector2D coordinates() const Q_DECL_NOTHROW
+ constexpr QVector2D coordinates() const noexcept
{
return m_coordinates;
}
- void setLeftControlPoint(QVector2D lh) Q_DECL_NOTHROW
+ void setLeftControlPoint(QVector2D lh) noexcept
{
m_leftControlPoint = lh;
}
- Q_DECL_CONSTEXPR QVector2D leftControlPoint() const Q_DECL_NOTHROW
+ constexpr QVector2D leftControlPoint() const noexcept
{
return m_leftControlPoint;
}
- void setRightControlPoint(QVector2D rh) Q_DECL_NOTHROW
+ void setRightControlPoint(QVector2D rh) noexcept
{
m_rightControlPoint = rh;
}
- Q_DECL_CONSTEXPR QVector2D rightControlPoint() const Q_DECL_NOTHROW
+ constexpr QVector2D rightControlPoint() const noexcept
{
return m_rightControlPoint;
}
- void setInterpolationType(InterpolationType interp) Q_DECL_NOTHROW
+ void setInterpolationType(InterpolationType interp) noexcept
{
m_interpolationType = interp;
}
- Q_DECL_CONSTEXPR InterpolationType interpolationType() const Q_DECL_NOTHROW
+ constexpr InterpolationType interpolationType() const noexcept
{
return m_interpolationType;
}
- friend inline bool operator==(const QKeyFrame &, const QKeyFrame &) Q_DECL_NOTHROW;
- friend inline bool operator!=(const QKeyFrame &, const QKeyFrame &) Q_DECL_NOTHROW;
+ friend inline bool operator==(const QKeyFrame &, const QKeyFrame &) noexcept;
+ friend inline bool operator!=(const QKeyFrame &, const QKeyFrame &) noexcept;
private:
QVector2D m_coordinates;
@@ -134,7 +134,7 @@ private:
QT3D_DECLARE_TYPEINFO(Qt3DAnimation, QKeyFrame, Q_PRIMITIVE_TYPE)
-inline bool operator==(const QKeyFrame &lhs, const QKeyFrame &rhs) Q_DECL_NOTHROW
+inline bool operator==(const QKeyFrame &lhs, const QKeyFrame &rhs) noexcept
{
if (lhs.m_interpolationType != rhs.m_interpolationType)
return false;
@@ -148,7 +148,7 @@ inline bool operator==(const QKeyFrame &lhs, const QKeyFrame &rhs) Q_DECL_NOTHRO
return lhs.m_coordinates == rhs.m_coordinates;
}
-inline bool operator!=(const QKeyFrame &lhs, const QKeyFrame &rhs) Q_DECL_NOTHROW
+inline bool operator!=(const QKeyFrame &lhs, const QKeyFrame &rhs) noexcept
{
return !(lhs == rhs);
}