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>

8 files changed, 70 insertions, 70 deletions

diff --git a/src/animation/backend/handler_p.h b/src/animation/backend/handler_p.h
index 4f9f24091..f565704b8 100644
--- a/src/animation/backend/handler_p.h
+++ b/src/animation/backend/handler_p.h
@@ -110,14 +110,14 @@ public:
     void setBlendedClipAnimatorRunning(const HBlendedClipAnimator &handle, bool running);
     QList<HBlendedClipAnimator> runningBlenndedClipAnimators() const { return m_runningBlendedClipAnimators; }
 
-    AnimationClipLoaderManager *animationClipLoaderManager() const Q_DECL_NOTHROW { return m_animationClipLoaderManager.data(); }
-    ClockManager *clockManager() const Q_DECL_NOTHROW { return m_clockManager.data(); }
-    ClipAnimatorManager *clipAnimatorManager() const Q_DECL_NOTHROW { return m_clipAnimatorManager.data(); }
-    BlendedClipAnimatorManager *blendedClipAnimatorManager() const Q_DECL_NOTHROW { return m_blendedClipAnimatorManager.data(); }
-    ChannelMappingManager *channelMappingManager() const Q_DECL_NOTHROW { return m_channelMappingManager.data(); }
-    ChannelMapperManager *channelMapperManager() const Q_DECL_NOTHROW { return m_channelMapperManager.data(); }
-    ClipBlendNodeManager *clipBlendNodeManager() const Q_DECL_NOTHROW { return m_clipBlendNodeManager.data(); }
-    SkeletonManager *skeletonManager() const Q_DECL_NOTHROW { return m_skeletonManager.data(); }
+    AnimationClipLoaderManager *animationClipLoaderManager() const noexcept { return m_animationClipLoaderManager.data(); }
+    ClockManager *clockManager() const noexcept { return m_clockManager.data(); }
+    ClipAnimatorManager *clipAnimatorManager() const noexcept { return m_clipAnimatorManager.data(); }
+    BlendedClipAnimatorManager *blendedClipAnimatorManager() const noexcept { return m_blendedClipAnimatorManager.data(); }
+    ChannelMappingManager *channelMappingManager() const noexcept { return m_channelMappingManager.data(); }
+    ChannelMapperManager *channelMapperManager() const noexcept { return m_channelMapperManager.data(); }
+    ClipBlendNodeManager *clipBlendNodeManager() const noexcept { return m_clipBlendNodeManager.data(); }
+    SkeletonManager *skeletonManager() const noexcept { return m_skeletonManager.data(); }
 
     std::vector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time);
 
diff --git a/src/animation/frontend/qanimationclipdata.cpp b/src/animation/frontend/qanimationclipdata.cpp
index 8131d194f..41ebe68ef 100644
--- a/src/animation/frontend/qanimationclipdata.cpp
+++ b/src/animation/frontend/qanimationclipdata.cpp
@@ -114,30 +114,30 @@ void QAnimationClipData::clearChannels()
     d->m_channels.clear();
 }
 
-bool QAnimationClipData::isValid() const Q_DECL_NOTHROW
+bool QAnimationClipData::isValid() const noexcept
 {
     // TODO: Perform more thorough checks
     return !d->m_channels.isEmpty();
 }
 
-QAnimationClipData::const_iterator QAnimationClipData::begin() const Q_DECL_NOTHROW
+QAnimationClipData::const_iterator QAnimationClipData::begin() const noexcept
 {
     return d->m_channels.cbegin();
 }
 
-QAnimationClipData::const_iterator QAnimationClipData::end() const Q_DECL_NOTHROW
+QAnimationClipData::const_iterator QAnimationClipData::end() const noexcept
 {
     return d->m_channels.cend();
 }
 
 
-bool operator==(const QAnimationClipData &lhs, const QAnimationClipData &rhs) Q_DECL_NOTHROW
+bool operator==(const QAnimationClipData &lhs, const QAnimationClipData &rhs) noexcept
 {
     return lhs.d->m_name == rhs.d->m_name &&
            lhs.d->m_channels == rhs.d->m_channels;
 }
 
-bool operator!=(const QAnimationClipData &lhs, const QAnimationClipData &rhs) Q_DECL_NOTHROW
+bool operator!=(const QAnimationClipData &lhs, const QAnimationClipData &rhs) noexcept
 {
     return lhs.d->m_name != rhs.d->m_name ||
            lhs.d->m_channels != rhs.d->m_channels;
diff --git a/src/animation/frontend/qanimationclipdata.h b/src/animation/frontend/qanimationclipdata.h
index 9a5d92132..07c7d92c2 100644
--- a/src/animation/frontend/qanimationclipdata.h
+++ b/src/animation/frontend/qanimationclipdata.h
@@ -52,8 +52,8 @@ namespace Qt3DAnimation {
 class QAnimationClipDataPrivate;
 class QAnimationClipData;
 
-bool Q_3DANIMATIONSHARED_EXPORT operator==(const QAnimationClipData &lhs, const QAnimationClipData &rhs) Q_DECL_NOTHROW;
-bool Q_3DANIMATIONSHARED_EXPORT operator!=(const QAnimationClipData &lhs, const QAnimationClipData &rhs) Q_DECL_NOTHROW;
+bool Q_3DANIMATIONSHARED_EXPORT operator==(const QAnimationClipData &lhs, const QAnimationClipData &rhs) noexcept;
+bool Q_3DANIMATIONSHARED_EXPORT operator!=(const QAnimationClipData &lhs, const QAnimationClipData &rhs) noexcept;
 
 class Q_3DANIMATIONSHARED_EXPORT QAnimationClipData
 {
@@ -72,25 +72,25 @@ public:
     void removeChannel(int index);
     void clearChannels();
 
-    bool isValid() const Q_DECL_NOTHROW;
+    bool isValid() const noexcept;
 
     // Iterator API
     typedef const QChannel *const_iterator;
     typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
 
-    const_iterator begin()  const Q_DECL_NOTHROW;
-    const_iterator cbegin() const Q_DECL_NOTHROW { return begin(); }
-    const_iterator end()    const Q_DECL_NOTHROW;
-    const_iterator cend()   const Q_DECL_NOTHROW { return end(); }
-    const_reverse_iterator rbegin()  const Q_DECL_NOTHROW { return const_reverse_iterator(end()); }
-    const_reverse_iterator crbegin() const Q_DECL_NOTHROW { return rbegin(); }
-    const_reverse_iterator rend()    const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); }
-    const_reverse_iterator crend()   const Q_DECL_NOTHROW { return rend(); }
+    const_iterator begin()  const noexcept;
+    const_iterator cbegin() const noexcept { return begin(); }
+    const_iterator end()    const noexcept;
+    const_iterator cend()   const noexcept { return end(); }
+    const_reverse_iterator rbegin()  const noexcept { return const_reverse_iterator(end()); }
+    const_reverse_iterator crbegin() const noexcept { return rbegin(); }
+    const_reverse_iterator rend()    const noexcept { return const_reverse_iterator(begin()); }
+    const_reverse_iterator crend()   const noexcept { return rend(); }
 
     friend bool operator==(const QAnimationClipData &,
-                           const QAnimationClipData &) Q_DECL_NOTHROW;
+                           const QAnimationClipData &) noexcept;
     friend bool operator!=(const QAnimationClipData &,
-                           const QAnimationClipData &) Q_DECL_NOTHROW;
+                           const QAnimationClipData &) noexcept;
 
 private:
     QScopedPointer<QAnimationClipDataPrivate> d;
diff --git a/src/animation/frontend/qchannel.cpp b/src/animation/frontend/qchannel.cpp
index 3970ea8ab..8012f1b5c 100644
--- a/src/animation/frontend/qchannel.cpp
+++ b/src/animation/frontend/qchannel.cpp
@@ -136,22 +136,22 @@ void QChannel::clearChannelComponents()
     d->m_channelComponents.clear();
 }
 
-QChannel::const_iterator QChannel::begin() const Q_DECL_NOTHROW
+QChannel::const_iterator QChannel::begin() const noexcept
 {
     return d->m_channelComponents.cbegin();
 }
 
-QChannel::const_iterator QChannel::end() const Q_DECL_NOTHROW
+QChannel::const_iterator QChannel::end() const noexcept
 {
     return d->m_channelComponents.cend();
 }
 
-bool operator==(const QChannel &lhs, const QChannel &rhs) Q_DECL_NOTHROW
+bool operator==(const QChannel &lhs, const QChannel &rhs) noexcept
 {
     return lhs.d->m_name == rhs.d->m_name && lhs.d->m_channelComponents == rhs.d->m_channelComponents;
 }
 
-bool operator!=(const QChannel &lhs, const QChannel &rhs) Q_DECL_NOTHROW
+bool operator!=(const QChannel &lhs, const QChannel &rhs) noexcept
 {
     return lhs.d->m_name != rhs.d->m_name || lhs.d->m_channelComponents != rhs.d->m_channelComponents;
 }
diff --git a/src/animation/frontend/qchannel.h b/src/animation/frontend/qchannel.h
index 4c856dba5..f13466094 100644
--- a/src/animation/frontend/qchannel.h
+++ b/src/animation/frontend/qchannel.h
@@ -76,19 +76,19 @@ public:
     typedef const QChannelComponent *const_iterator;
     typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
 
-    const_iterator begin()  const Q_DECL_NOTHROW;
-    const_iterator cbegin() const Q_DECL_NOTHROW { return begin(); }
-    const_iterator end()    const Q_DECL_NOTHROW;
-    const_iterator cend()   const Q_DECL_NOTHROW { return end(); }
-    const_reverse_iterator rbegin()  const Q_DECL_NOTHROW { return const_reverse_iterator(end()); }
-    const_reverse_iterator crbegin() const Q_DECL_NOTHROW { return rbegin(); }
-    const_reverse_iterator rend()    const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); }
-    const_reverse_iterator crend()   const Q_DECL_NOTHROW { return rend(); }
+    const_iterator begin()  const noexcept;
+    const_iterator cbegin() const noexcept { return begin(); }
+    const_iterator end()    const noexcept;
+    const_iterator cend()   const noexcept { return end(); }
+    const_reverse_iterator rbegin()  const noexcept { return const_reverse_iterator(end()); }
+    const_reverse_iterator crbegin() const noexcept { return rbegin(); }
+    const_reverse_iterator rend()    const noexcept { return const_reverse_iterator(begin()); }
+    const_reverse_iterator crend()   const noexcept { return rend(); }
 
     friend bool operator==(const QChannel &,
-                           const QChannel &) Q_DECL_NOTHROW;
+                           const QChannel &) noexcept;
     friend bool operator!=(const QChannel &,
-                           const QChannel &) Q_DECL_NOTHROW;
+                           const QChannel &) noexcept;
 
 private:
     QScopedPointer<QChannelPrivate> d;
diff --git a/src/animation/frontend/qchannelcomponent.cpp b/src/animation/frontend/qchannelcomponent.cpp
index e26752aa6..755ed6294 100644
--- a/src/animation/frontend/qchannelcomponent.cpp
+++ b/src/animation/frontend/qchannelcomponent.cpp
@@ -115,23 +115,23 @@ void QChannelComponent::clearKeyFrames()
     d->m_keyFrames.clear();
 }
 
-QChannelComponent::const_iterator QChannelComponent::begin() const Q_DECL_NOTHROW
+QChannelComponent::const_iterator QChannelComponent::begin() const noexcept
 {
     return d->m_keyFrames.cbegin();
 }
 
-QChannelComponent::const_iterator QChannelComponent::end() const Q_DECL_NOTHROW
+QChannelComponent::const_iterator QChannelComponent::end() const noexcept
 {
     return d->m_keyFrames.cend();
 }
 
-bool operator==(const QChannelComponent &lhs, const QChannelComponent &rhs) Q_DECL_NOTHROW
+bool operator==(const QChannelComponent &lhs, const QChannelComponent &rhs) noexcept
 {
     return lhs.d->m_name == rhs.d->m_name &&
            lhs.d->m_keyFrames == rhs.d->m_keyFrames;
 }
 
-bool operator!=(const QChannelComponent &lhs, const QChannelComponent &rhs) Q_DECL_NOTHROW
+bool operator!=(const QChannelComponent &lhs, const QChannelComponent &rhs) noexcept
 {
     return lhs.d->m_name != rhs.d->m_name ||
            lhs.d->m_keyFrames != rhs.d->m_keyFrames;
diff --git a/src/animation/frontend/qchannelcomponent.h b/src/animation/frontend/qchannelcomponent.h
index aa29d7fd5..066d23447 100644
--- a/src/animation/frontend/qchannelcomponent.h
+++ b/src/animation/frontend/qchannelcomponent.h
@@ -73,19 +73,19 @@ public:
     typedef const QKeyFrame *const_iterator;
     typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
 
-    const_iterator begin()  const Q_DECL_NOTHROW;
-    const_iterator cbegin() const Q_DECL_NOTHROW { return begin(); }
-    const_iterator end()    const Q_DECL_NOTHROW;
-    const_iterator cend()   const Q_DECL_NOTHROW { return end(); }
-    const_reverse_iterator rbegin()  const Q_DECL_NOTHROW { return const_reverse_iterator(end()); }
-    const_reverse_iterator crbegin() const Q_DECL_NOTHROW { return rbegin(); }
-    const_reverse_iterator rend()    const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); }
-    const_reverse_iterator crend()   const Q_DECL_NOTHROW { return rend(); }
+    const_iterator begin()  const noexcept;
+    const_iterator cbegin() const noexcept { return begin(); }
+    const_iterator end()    const noexcept;
+    const_iterator cend()   const noexcept { return end(); }
+    const_reverse_iterator rbegin()  const noexcept { return const_reverse_iterator(end()); }
+    const_reverse_iterator crbegin() const noexcept { return rbegin(); }
+    const_reverse_iterator rend()    const noexcept { return const_reverse_iterator(begin()); }
+    const_reverse_iterator crend()   const noexcept { return rend(); }
 
     friend bool operator==(const QChannelComponent &,
-                           const QChannelComponent &) Q_DECL_NOTHROW;
+                           const QChannelComponent &) noexcept;
     friend bool operator!=(const QChannelComponent &,
-                           const QChannelComponent &) Q_DECL_NOTHROW;
+                           const QChannelComponent &) noexcept;
 
 private:
     QScopedPointer<QChannelComponentPrivate> d;
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);
 }