diff options
Diffstat (limited to 'src/input')
-rw-r--r-- | src/input/backend/axisaccumulator_p.h | 4 | ||||
-rw-r--r-- | src/input/backend/qabstractphysicaldevicebackendnode.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/input/backend/axisaccumulator_p.h b/src/input/backend/axisaccumulator_p.h index 2f5a7de63..861730b5d 100644 --- a/src/input/backend/axisaccumulator_p.h +++ b/src/input/backend/axisaccumulator_p.h @@ -73,10 +73,10 @@ public: QAxisAccumulator::SourceAxisType sourceAxisType() const { return m_sourceAxisType; } float scale() const { return m_scale; } - float value() const Q_DECL_NOTHROW { return m_value; } + float value() const noexcept { return m_value; } void setValue(float value); - float velocity() const Q_DECL_NOTHROW { return m_velocity; } + float velocity() const noexcept { return m_velocity; } void setVelocity(float velocity); void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override; diff --git a/src/input/backend/qabstractphysicaldevicebackendnode.cpp b/src/input/backend/qabstractphysicaldevicebackendnode.cpp index f7447eb80..2526fead1 100644 --- a/src/input/backend/qabstractphysicaldevicebackendnode.cpp +++ b/src/input/backend/qabstractphysicaldevicebackendnode.cpp @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE namespace { -Q_DECL_CONSTEXPR int signum(float v) +constexpr int signum(float v) { return (v > 0.0f) - (v < 0.0f); } |