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/core/aspects | |
| 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/core/aspects')
| -rw-r--r-- | src/core/aspects/qabstractaspect.cpp | 2 | ||||
| -rw-r--r-- | src/core/aspects/qabstractaspect.h | 2 | ||||
| -rw-r--r-- | src/core/aspects/qaspectfactory_p.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp index 31938696b..4c42b5093 100644 --- a/src/core/aspects/qabstractaspect.cpp +++ b/src/core/aspects/qabstractaspect.cpp @@ -162,7 +162,7 @@ QAbstractAspect::~QAbstractAspect() /*! * \return root entity node id. */ -QNodeId QAbstractAspect::rootEntityId() const Q_DECL_NOEXCEPT +QNodeId QAbstractAspect::rootEntityId() const noexcept { Q_D(const QAbstractAspect); return d->m_rootId; diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h index 9a03d04dc..ba2d13139 100644 --- a/src/core/aspects/qabstractaspect.h +++ b/src/core/aspects/qabstractaspect.h @@ -74,7 +74,7 @@ public: protected: explicit QAbstractAspect(QAbstractAspectPrivate &dd, QObject *parent = nullptr); - QNodeId rootEntityId() const Q_DECL_NOEXCEPT; + QNodeId rootEntityId() const noexcept; template<class Frontend> void registerBackendType(const QBackendNodeMapperPtr &functor); diff --git a/src/core/aspects/qaspectfactory_p.h b/src/core/aspects/qaspectfactory_p.h index 41a063900..8a286d356 100644 --- a/src/core/aspects/qaspectfactory_p.h +++ b/src/core/aspects/qaspectfactory_p.h @@ -75,7 +75,7 @@ public: ~QAspectFactory(); QAspectFactory &operator=(const QAspectFactory &other); #ifdef Q_COMPILER_RVALUE_REFS - QAspectFactory &operator=(QAspectFactory &&other) Q_DECL_NOTHROW + QAspectFactory &operator=(QAspectFactory &&other) noexcept { m_factories.swap(other.m_factories); m_aspectNames.swap(other.m_aspectNames); @@ -83,7 +83,7 @@ public: } #endif - inline void swap(QAspectFactory &other) Q_DECL_NOTHROW + inline void swap(QAspectFactory &other) noexcept { m_factories.swap(other.m_factories); m_aspectNames.swap(other.m_aspectNames); |