diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-30 16:07:58 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-02 09:01:31 +0100 |
commit | 1086a29bfdf5d78afbb95ac3b710e7892981aac1 (patch) | |
tree | 57d27ac3fe0d4297a398bb7966747dd93e95afd1 /src/input | |
parent | 9dd441c4297296d8efda629d0929aaad6d278b51 (diff) |
Replace old Q_DECL statements with modern C++
Since we have long depended on C++11 now, all of these can go.
Change-Id: I8808af2cd5ce192864c636b521dadd7de189563b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
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); } |