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/render/backend | |
| 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/render/backend')
| -rw-r--r-- | src/render/backend/computecommand_p.h | 10 | ||||
| -rw-r--r-- | src/render/backend/segmentsvisitor.cpp | 2 | ||||
| -rw-r--r-- | src/render/backend/trianglesvisitor.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/render/backend/computecommand_p.h b/src/render/backend/computecommand_p.h index 00e238474..22d643f05 100644 --- a/src/render/backend/computecommand_p.h +++ b/src/render/backend/computecommand_p.h @@ -71,11 +71,11 @@ public: void cleanup(); void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override; - inline int x() const Q_DECL_NOTHROW { return m_workGroups[0]; } - inline int y() const Q_DECL_NOTHROW { return m_workGroups[1]; } - inline int z() const Q_DECL_NOTHROW { return m_workGroups[2]; } - inline int frameCount() const Q_DECL_NOTHROW { return m_frameCount; } - inline QComputeCommand::RunType runType() const Q_DECL_NOTHROW { return m_runType; } + inline int x() const noexcept { return m_workGroups[0]; } + inline int y() const noexcept { return m_workGroups[1]; } + inline int z() const noexcept { return m_workGroups[2]; } + inline int frameCount() const noexcept { return m_frameCount; } + inline QComputeCommand::RunType runType() const noexcept { return m_runType; } // Called from a job void updateFrameCount(); diff --git a/src/render/backend/segmentsvisitor.cpp b/src/render/backend/segmentsvisitor.cpp index f19801ddf..6749d69f1 100644 --- a/src/render/backend/segmentsvisitor.cpp +++ b/src/render/backend/segmentsvisitor.cpp @@ -59,7 +59,7 @@ namespace Render { namespace { -bool isSegmentBased(Qt3DRender::QGeometryRenderer::PrimitiveType type) Q_DECL_NOTHROW +bool isSegmentBased(Qt3DRender::QGeometryRenderer::PrimitiveType type) noexcept { switch (type) { case Qt3DRender::QGeometryRenderer::Lines: diff --git a/src/render/backend/trianglesvisitor.cpp b/src/render/backend/trianglesvisitor.cpp index 336e57c7e..2feb86588 100644 --- a/src/render/backend/trianglesvisitor.cpp +++ b/src/render/backend/trianglesvisitor.cpp @@ -62,7 +62,7 @@ namespace Render { namespace { -bool isTriangleBased(Qt3DRender::QGeometryRenderer::PrimitiveType type) Q_DECL_NOTHROW +bool isTriangleBased(Qt3DRender::QGeometryRenderer::PrimitiveType type) noexcept { switch (type) { case Qt3DRender::QGeometryRenderer::Triangles: |