summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2016-05-19 17:16:37 +0200
committerSean Harmer <sean.harmer@kdab.com>2016-05-23 11:59:53 +0000
commit15dace7c02bc5acdf02f94c8be08fec1a792383c (patch)
treef91b48a3860d21c2e3574765ad66b362c0563306 /src/plugins
parente53a337637a3534fd9b94156d3db2cf0a11abb10 (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/plugins')
-rw-r--r--src/plugins/sceneparsers/assimp/assimpio.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimpio.cpp b/src/plugins/sceneparsers/assimp/assimpio.cpp
index bb5686d51..32dd14c6f 100644
--- a/src/plugins/sceneparsers/assimp/assimpio.cpp
+++ b/src/plugins/sceneparsers/assimp/assimpio.cpp
@@ -125,7 +125,7 @@ const QString COLOR_ATTRIBUTE_NAME = QAttribute::defaultColorAttributeName();
/*!
* Returns a QMatrix4x4 from \a matrix;
*/
-QMatrix4x4 aiMatrix4x4ToQMatrix4x4(const aiMatrix4x4 &matrix) Q_DECL_NOEXCEPT
+QMatrix4x4 aiMatrix4x4ToQMatrix4x4(const aiMatrix4x4 &matrix) Q_DECL_NOTHROW
{
return QMatrix4x4(matrix.a1, matrix.a2, matrix.a3, matrix.a4,
matrix.b1, matrix.b2, matrix.b3, matrix.b4,
@@ -141,7 +141,7 @@ static inline QString aiStringToQString(const aiString &str)
return QString::fromUtf8(str.data, int(str.length));
}
-QMaterial *createBestApproachingMaterial(const aiMaterial *assimpMaterial) Q_DECL_NOEXCEPT
+QMaterial *createBestApproachingMaterial(const aiMaterial *assimpMaterial)
{
aiString path; // unused but necessary
const bool hasDiffuseTexture = (assimpMaterial->GetTexture(aiTextureType_DIFFUSE, 0, &path) == AI_SUCCESS);