1 files changed, 15 insertions, 21 deletions
diff --git a/src/corelib/tools/qrect.cpp b/src/corelib/tools/qrect.cpp
index ad1885e8ce..d622f92530 100644
--- a/src/corelib/tools/qrect.cpp
+++ b/src/corelib/tools/qrect.cpp
@@ -300,7 +300,7 @@ QT_BEGIN_NAMESPACE
     \sa isValid(), isEmpty()
 */
 
-QRect QRect::normalized() const Q_DECL_NOTHROW
+QRect QRect::normalized() const noexcept
 {
     QRect r;
     if (x2 < x1 - 1) {                                // swap bad x values
@@ -713,10 +713,7 @@ QRect QRect::normalized() const Q_DECL_NOTHROW
     Returns a copy of the rectangle that has its width and height
     exchanged:
 
-    \code
-    QRect r = {15, 51, 42, 24};
-    r = r.transposed(); // r == {15, 51, 24, 42}
-    \endcode
+    \snippet code/src_corelib_tools_qrect.cpp 2
 
     \sa QSize::transposed()
 */
@@ -823,7 +820,7 @@ QRect QRect::normalized() const Q_DECL_NOTHROW
     \sa intersects()
 */
 
-bool QRect::contains(const QPoint &p, bool proper) const Q_DECL_NOTHROW
+bool QRect::contains(const QPoint &p, bool proper) const noexcept
 {
     int l, r;
     if (x2 < x1 - 1) {
@@ -887,7 +884,7 @@ bool QRect::contains(const QPoint &p, bool proper) const Q_DECL_NOTHROW
     rectangle (not on the edge).
 */
 
-bool QRect::contains(const QRect &r, bool proper) const Q_DECL_NOTHROW
+bool QRect::contains(const QRect &r, bool proper) const noexcept
 {
     if (isNull() || r.isNull())
         return false;
@@ -965,7 +962,7 @@ bool QRect::contains(const QRect &r, bool proper) const Q_DECL_NOTHROW
     \sa operator|=(), united()
 */
 
-QRect QRect::operator|(const QRect &r) const Q_DECL_NOTHROW
+QRect QRect::operator|(const QRect &r) const noexcept
 {
     if (isNull())
         return r;
@@ -1036,7 +1033,7 @@ QRect QRect::operator|(const QRect &r) const Q_DECL_NOTHROW
     \sa operator&=(), intersected()
 */
 
-QRect QRect::operator&(const QRect &r) const Q_DECL_NOTHROW
+QRect QRect::operator&(const QRect &r) const noexcept
 {
     if (isNull() || r.isNull())
         return QRect();
@@ -1115,7 +1112,7 @@ QRect QRect::operator&(const QRect &r) const Q_DECL_NOTHROW
     \sa contains()
 */
 
-bool QRect::intersects(const QRect &r) const Q_DECL_NOTHROW
+bool QRect::intersects(const QRect &r) const noexcept
 {
     if (isNull() || r.isNull())
         return false;
@@ -1543,7 +1540,7 @@ QDebug operator<<(QDebug dbg, const QRect &r)
     \sa isValid(), isEmpty()
 */
 
-QRectF QRectF::normalized() const Q_DECL_NOTHROW
+QRectF QRectF::normalized() const noexcept
 {
     QRectF r = *this;
     if (r.w < 0) {
@@ -1863,10 +1860,7 @@ QRectF QRectF::normalized() const Q_DECL_NOTHROW
     Returns a copy of the rectangle that has its width and height
     exchanged:
 
-    \code
-    QRectF r = {1.5, 5.1, 4.2, 2.4};
-    r = r.transposed(); // r == {1.5, 5.1, 2.4, 4.2}
-    \endcode
+    \snippet code/src_corelib_tools_qrect.cpp 3
 
     \sa QSizeF::transposed()
 */
@@ -1970,7 +1964,7 @@ QRectF QRectF::normalized() const Q_DECL_NOTHROW
     \sa intersects()
 */
 
-bool QRectF::contains(const QPointF &p) const Q_DECL_NOTHROW
+bool QRectF::contains(const QPointF &p) const noexcept
 {
     qreal l = xp;
     qreal r = xp;
@@ -2016,7 +2010,7 @@ bool QRectF::contains(const QPointF &p) const Q_DECL_NOTHROW
     otherwise returns \c false.
 */
 
-bool QRectF::contains(const QRectF &r) const Q_DECL_NOTHROW
+bool QRectF::contains(const QRectF &r) const noexcept
 {
     qreal l1 = xp;
     qreal r1 = xp;
@@ -2154,7 +2148,7 @@ bool QRectF::contains(const QRectF &r) const Q_DECL_NOTHROW
     \sa united(), operator|=()
 */
 
-QRectF QRectF::operator|(const QRectF &r) const Q_DECL_NOTHROW
+QRectF QRectF::operator|(const QRectF &r) const noexcept
 {
     if (isNull())
         return r;
@@ -2223,7 +2217,7 @@ QRectF QRectF::operator|(const QRectF &r) const Q_DECL_NOTHROW
     \sa operator&=(), intersected()
 */
 
-QRectF QRectF::operator&(const QRectF &r) const Q_DECL_NOTHROW
+QRectF QRectF::operator&(const QRectF &r) const noexcept
 {
     qreal l1 = xp;
     qreal r1 = xp;
@@ -2308,7 +2302,7 @@ QRectF QRectF::operator&(const QRectF &r) const Q_DECL_NOTHROW
     \sa contains()
 */
 
-bool QRectF::intersects(const QRectF &r) const Q_DECL_NOTHROW
+bool QRectF::intersects(const QRectF &r) const noexcept
 {
     qreal l1 = xp;
     qreal r1 = xp;
@@ -2375,7 +2369,7 @@ bool QRectF::intersects(const QRectF &r) const Q_DECL_NOTHROW
     \sa toRect()
 */
 
-QRect QRectF::toAlignedRect() const Q_DECL_NOTHROW
+QRect QRectF::toAlignedRect() const noexcept
 {
     int xmin = int(qFloor(xp));
     int xmax = int(qCeil(xp + w));