summaryrefslogtreecommitdiffstats
path: root/src/gui/util
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-08-12 15:53:52 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-08-13 19:58:40 +0200
commitd4a73d42557fab58fdab87304692062812ad5889 (patch)
treec94f13658a03ea28deb3432256289ba75c4f471f /src/gui/util
parentd12afeff4097dd78f1311511e0c8f74e1a810d47 (diff)
Another round of using noexcept instead of pre-C++11 defines
A few new files were added with old-school defines. Change-Id: Ieb2c71e094e55102f3f39fb9551823f36863f5f4 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/gui/util')
-rw-r--r--src/gui/util/qshaderformat.cpp4
-rw-r--r--src/gui/util/qshaderformat_p.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/util/qshaderformat.cpp b/src/gui/util/qshaderformat.cpp
index ea86dd6ca5..d56dfc413e 100644
--- a/src/gui/util/qshaderformat.cpp
+++ b/src/gui/util/qshaderformat.cpp
@@ -123,12 +123,12 @@ bool QShaderFormat::supports(const QShaderFormat &other) const noexcept
return true;
}
-QShaderFormat::ShaderType QShaderFormat::shaderType() const Q_DECL_NOTHROW
+QShaderFormat::ShaderType QShaderFormat::shaderType() const noexcept
{
return m_shaderType;
}
-void QShaderFormat::setShaderType(QShaderFormat::ShaderType shaderType) Q_DECL_NOTHROW
+void QShaderFormat::setShaderType(QShaderFormat::ShaderType shaderType) noexcept
{
m_shaderType = shaderType;
}
diff --git a/src/gui/util/qshaderformat_p.h b/src/gui/util/qshaderformat_p.h
index d9d0378f63..3559c67414 100644
--- a/src/gui/util/qshaderformat_p.h
+++ b/src/gui/util/qshaderformat_p.h
@@ -96,8 +96,8 @@ public:
Q_GUI_EXPORT bool isValid() const noexcept;
Q_GUI_EXPORT bool supports(const QShaderFormat &other) const noexcept;
- Q_GUI_EXPORT ShaderType shaderType() const Q_DECL_NOTHROW;
- Q_GUI_EXPORT void setShaderType(ShaderType shaderType) Q_DECL_NOTHROW;
+ Q_GUI_EXPORT ShaderType shaderType() const noexcept;
+ Q_GUI_EXPORT void setShaderType(ShaderType shaderType) noexcept;
private:
Api m_api;