diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-02 10:59:52 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-05 22:26:49 +0000 |
commit | dbf7706413bb8d624ac17b24398eaf4ef542ed6b (patch) | |
tree | eef2343e4e3b8cdab2d0c126496b2583f884393a /src/gui/painting/qmatrix.h | |
parent | 6b66108c1ffc48ee1dc06c4e25d9210bf2d41084 (diff) |
Replace Q_DECL_NOEXCEPT with noexcept in QtGui
Change-Id: I43803b88fea8083782d73ce157c466b022208740
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/painting/qmatrix.h')
-rw-r--r-- | src/gui/painting/qmatrix.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/painting/qmatrix.h b/src/gui/painting/qmatrix.h index d8a4fcfb1c..a167260ade 100644 --- a/src/gui/painting/qmatrix.h +++ b/src/gui/painting/qmatrix.h @@ -64,12 +64,12 @@ public: #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove; the compiler-generated ones are fine! - QMatrix &operator=(QMatrix &&other) Q_DECL_NOTHROW // = default + QMatrix &operator=(QMatrix &&other) noexcept // = default { memcpy(static_cast<void *>(this), static_cast<void *>(&other), sizeof(QMatrix)); return *this; } - QMatrix &operator=(const QMatrix &) Q_DECL_NOTHROW; // = default - QMatrix(QMatrix &&other) Q_DECL_NOTHROW // = default + QMatrix &operator=(const QMatrix &) noexcept; // = default + QMatrix(QMatrix &&other) noexcept // = default { memcpy(static_cast<void *>(this), static_cast<void *>(&other), sizeof(QMatrix)); } - QMatrix(const QMatrix &other) Q_DECL_NOTHROW; // = default + QMatrix(const QMatrix &other) noexcept; // = default #endif void setMatrix(qreal m11, qreal m12, qreal m21, qreal m22, @@ -140,7 +140,7 @@ private: }; Q_DECLARE_TYPEINFO(QMatrix, Q_MOVABLE_TYPE); -Q_GUI_EXPORT Q_DECL_CONST_FUNCTION uint qHash(const QMatrix &key, uint seed = 0) Q_DECL_NOTHROW; +Q_GUI_EXPORT Q_DECL_CONST_FUNCTION uint qHash(const QMatrix &key, uint seed = 0) noexcept; // mathematical semantics inline QPoint operator*(const QPoint &p, const QMatrix &m) |