diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2016-05-19 17:16:37 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-23 11:59:53 +0000 |
commit | 15dace7c02bc5acdf02f94c8be08fec1a792383c (patch) | |
tree | f91b48a3860d21c2e3574765ad66b362c0563306 /src/quick3d | |
parent | e53a337637a3534fd9b94156d3db2cf0a11abb10 (diff) |
Replace Q_DECL_NOEXCEPT by Q_DECL_NOTHROW
Change-Id: Ia991da557483704055e0ccf17b4a6b273568a1ba
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/quick3d')
-rw-r--r-- | src/quick3d/imports/scene3d/scene3drenderer.cpp | 2 | ||||
-rw-r--r-- | src/quick3d/imports/scene3d/scene3drenderer_p.h | 2 | ||||
-rw-r--r-- | src/quick3d/imports/scene3d/scene3dsgmaterial_p.h | 4 | ||||
-rw-r--r-- | src/quick3d/imports/scene3d/scene3dsgnode_p.h | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/quick3d/imports/scene3d/scene3drenderer.cpp b/src/quick3d/imports/scene3d/scene3drenderer.cpp index 44a57e039..a8684f329 100644 --- a/src/quick3d/imports/scene3d/scene3drenderer.cpp +++ b/src/quick3d/imports/scene3d/scene3drenderer.cpp @@ -207,7 +207,7 @@ void Scene3DRenderer::synchronize() m_multisample = m_item->multisample(); } -void Scene3DRenderer::setSGNode(Scene3DSGNode *node) Q_DECL_NOEXCEPT +void Scene3DRenderer::setSGNode(Scene3DSGNode *node) { m_node = node; if (!m_texture.isNull()) diff --git a/src/quick3d/imports/scene3d/scene3drenderer_p.h b/src/quick3d/imports/scene3d/scene3drenderer_p.h index 80045f66b..9ff5e7f36 100644 --- a/src/quick3d/imports/scene3d/scene3drenderer_p.h +++ b/src/quick3d/imports/scene3d/scene3drenderer_p.h @@ -84,7 +84,7 @@ public: QOpenGLFramebufferObject *createMultisampledFramebufferObject(const QSize &size); QOpenGLFramebufferObject *createFramebufferObject(const QSize &size); void scheduleRootEntityChange(); - void setSGNode(Scene3DSGNode *node) Q_DECL_NOEXCEPT; + void setSGNode(Scene3DSGNode *node); void setCleanerHelper(Scene3DCleaner *cleaner); void synchronize(); diff --git a/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h b/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h index 0ff1bed27..f3817dc05 100644 --- a/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h +++ b/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h @@ -65,13 +65,13 @@ class Scene3DSGMaterial : public QSGMaterial public: Scene3DSGMaterial(); - void setTexture(QSGTexture *texture) Q_DECL_NOEXCEPT + void setTexture(QSGTexture *texture) { m_texture = texture; setFlag(Blending, m_texture ? m_texture->hasAlphaChannel() : false); } - QSGTexture *texture() const Q_DECL_NOEXCEPT { return m_texture; } + QSGTexture *texture() const Q_DECL_NOTHROW { return m_texture; } QSGMaterialType *type() const Q_DECL_FINAL { return &Scene3DSGMaterialShader::type; } QSGMaterialShader *createShader() const Q_DECL_FINAL { return new Scene3DSGMaterialShader(); } diff --git a/src/quick3d/imports/scene3d/scene3dsgnode_p.h b/src/quick3d/imports/scene3d/scene3dsgnode_p.h index f123ffdaa..f7b21e2b9 100644 --- a/src/quick3d/imports/scene3d/scene3dsgnode_p.h +++ b/src/quick3d/imports/scene3d/scene3dsgnode_p.h @@ -67,16 +67,16 @@ public: Scene3DSGNode(); ~Scene3DSGNode(); - void setTexture(QSGTexture *texture) Q_DECL_NOEXCEPT + void setTexture(QSGTexture *texture) Q_DECL_NOTHROW { m_material.setTexture(texture); m_opaqueMaterial.setTexture(texture); markDirty(DirtyMaterial); } - QSGTexture *texture() const Q_DECL_NOEXCEPT { return m_material.texture(); } + QSGTexture *texture() const Q_DECL_NOTHROW { return m_material.texture(); } void setRect(const QRectF &rect); - QRectF rect() const Q_DECL_NOEXCEPT { return m_rect; } + QRectF rect() const Q_DECL_NOTHROW { return m_rect; } private: Scene3DSGMaterial m_material; |