From e445f3c47bea3e2d3dffa1215b24cb90dccd8c73 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Tue, 21 Apr 2015 16:25:25 +0200
Subject: Add noexcept to move constructors and assignment operators

Add the noexcept attribute to all move constructors and assignment
operators in QtGui that didn't already have it.

Change-Id: Idcdf79ae8349b8793e7394b5ae7c08e6111fbc9a
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
---
 src/gui/image/qicon.cpp           |  2 +-
 src/gui/image/qicon.h             | 12 +++++++-----
 src/gui/image/qimage.cpp          |  2 +-
 src/gui/image/qimage.h            |  9 +++++----
 src/gui/image/qpicture.h          |  5 +++--
 src/gui/image/qpixmap.h           |  5 +++--
 src/gui/kernel/qevent.h           |  9 ++++++---
 src/gui/kernel/qpalette.h         | 10 ++++++----
 src/gui/painting/qbrush.h         |  5 +++--
 src/gui/painting/qpaintdevice.cpp |  2 +-
 src/gui/painting/qpaintdevice.h   |  2 +-
 src/gui/painting/qpainterpath.cpp |  2 +-
 src/gui/painting/qpainterpath.h   |  6 +++---
 src/gui/painting/qregion.h        |  4 ++--
 src/gui/text/qfont.h              |  2 +-
 src/gui/text/qfontmetrics.h       |  5 +++--
 16 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index 6d7a40c2ef..40ba84bb14 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -606,7 +606,7 @@ QFactoryLoader *qt_iconEngineFactoryLoader()
 /*!
   Constructs a null icon.
 */
-QIcon::QIcon()
+QIcon::QIcon() Q_DECL_NOEXCEPT
     : d(0)
 {
 }
diff --git a/src/gui/image/qicon.h b/src/gui/image/qicon.h
index d87468b4f0..63e77eef99 100644
--- a/src/gui/image/qicon.h
+++ b/src/gui/image/qicon.h
@@ -51,22 +51,24 @@ public:
     enum Mode { Normal, Disabled, Active, Selected };
     enum State { On, Off };
 
-    QIcon();
+    QIcon() Q_DECL_NOEXCEPT;
     QIcon(const QPixmap &pixmap);
     QIcon(const QIcon &other);
 #ifdef Q_COMPILER_RVALUE_REFS
-    QIcon(QIcon &&other)
-        :d(0) { qSwap(d, other.d); }
+    QIcon(QIcon &&other) Q_DECL_NOEXCEPT
+        : d(0)
+    { qSwap(d, other.d); }
 #endif
     explicit QIcon(const QString &fileName); // file or resource name
     explicit QIcon(QIconEngine *engine);
     ~QIcon();
     QIcon &operator=(const QIcon &other);
 #ifdef Q_COMPILER_RVALUE_REFS
-    inline QIcon &operator=(QIcon &&other)
+    inline QIcon &operator=(QIcon &&other) Q_DECL_NOEXCEPT
     { qSwap(d, other.d); return *this; }
 #endif
-    inline void swap(QIcon &other) { qSwap(d, other.d); }
+    inline void swap(QIcon &other) Q_DECL_NOEXCEPT
+    { qSwap(d, other.d); }
 
     operator QVariant() const;
 
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 1bbbc3e1f2..8a0f570f47 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -734,7 +734,7 @@ bool QImageData::checkForAlphaPixels() const
     \sa isNull()
 */
 
-QImage::QImage()
+QImage::QImage() Q_DECL_NOEXCEPT
     : QPaintDevice()
 {
     d = 0;
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index 99044bd4e3..26057f366c 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -121,7 +121,7 @@ public:
 #endif
     };
 
-    QImage();
+    QImage() Q_DECL_NOEXCEPT;
     QImage(const QSize &size, Format format);
     QImage(int width, int height, Format format);
     QImage(uchar *data, int width, int height, Format format, QImageCleanupFunction cleanupFunction = 0, void *cleanupInfo = 0);
@@ -136,7 +136,7 @@ public:
 
     QImage(const QImage &);
 #ifdef Q_COMPILER_RVALUE_REFS
-    inline QImage(QImage &&other)
+    inline QImage(QImage &&other) Q_DECL_NOEXCEPT
         : QPaintDevice(), d(0)
     { qSwap(d, other.d); }
 #endif
@@ -144,10 +144,11 @@ public:
 
     QImage &operator=(const QImage &);
 #ifdef Q_COMPILER_RVALUE_REFS
-    inline QImage &operator=(QImage &&other)
+    inline QImage &operator=(QImage &&other) Q_DECL_NOEXCEPT
     { qSwap(d, other.d); return *this; }
 #endif
-    inline void swap(QImage &other) { qSwap(d, other.d); }
+    inline void swap(QImage &other) Q_DECL_NOEXCEPT
+    { qSwap(d, other.d); }
 
     bool isNull() const;
 
diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h
index 9bb193321b..c3897a1935 100644
--- a/src/gui/image/qpicture.h
+++ b/src/gui/image/qpicture.h
@@ -72,10 +72,11 @@ public:
 
     QPicture& operator=(const QPicture &p);
 #ifdef Q_COMPILER_RVALUE_REFS
-    inline QPicture &operator=(QPicture &&other)
+    inline QPicture &operator=(QPicture &&other) Q_DECL_NOEXCEPT
     { qSwap(d_ptr, other.d_ptr); return *this; }
 #endif
-    inline void swap(QPicture &other) { d_ptr.swap(other.d_ptr); }
+    inline void swap(QPicture &other) Q_DECL_NOEXCEPT
+    { d_ptr.swap(other.d_ptr); }
     void detach();
     bool isDetached() const;
 
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index 810883ea6c..51b02acfcf 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -67,10 +67,11 @@ public:
 
     QPixmap &operator=(const QPixmap &);
 #ifdef Q_COMPILER_RVALUE_REFS
-    inline QPixmap &operator=(QPixmap &&other)
+    inline QPixmap &operator=(QPixmap &&other) Q_DECL_NOEXCEPT
     { qSwap(data, other.data); return *this; }
 #endif
-    inline void swap(QPixmap &other) { qSwap(data, other.data); }
+    inline void swap(QPixmap &other) Q_DECL_NOEXCEPT
+    { qSwap(data, other.data); }
 
     operator QVariant() const;
 
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index e931e28a2e..a1f32026ac 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -789,8 +789,10 @@ public:
         explicit TouchPoint(int id = -1);
         TouchPoint(const TouchPoint &other);
 #ifdef Q_COMPILER_RVALUE_REFS
-        TouchPoint(TouchPoint &&other) : d(other.d) { other.d = 0; }
-        TouchPoint &operator=(TouchPoint &&other)
+        TouchPoint(TouchPoint &&other) Q_DECL_NOEXCEPT
+            : d(0)
+        { qSwap(d, other.d); }
+        TouchPoint &operator=(TouchPoint &&other) Q_DECL_NOEXCEPT
         { qSwap(d, other.d); return *this; }
 #endif
         ~TouchPoint();
@@ -798,7 +800,8 @@ public:
         TouchPoint &operator=(const TouchPoint &other)
         { if ( d != other.d ) { TouchPoint copy(other); swap(copy); } return *this; }
 
-        void swap(TouchPoint &other) { qSwap(d, other.d); }
+        void swap(TouchPoint &other) Q_DECL_NOEXCEPT
+        { qSwap(d, other.d); }
 
         int id() const;
 
diff --git a/src/gui/kernel/qpalette.h b/src/gui/kernel/qpalette.h
index e8b35aa82a..78dd2ce9d7 100644
--- a/src/gui/kernel/qpalette.h
+++ b/src/gui/kernel/qpalette.h
@@ -61,16 +61,18 @@ public:
     ~QPalette();
     QPalette &operator=(const QPalette &palette);
 #ifdef Q_COMPILER_RVALUE_REFS
-    QPalette(QPalette &&other) Q_DECL_NOTHROW
-        : d(other.d), data(other.data) { other.d = Q_NULLPTR; }
-    inline QPalette &operator=(QPalette &&other)
+    QPalette(QPalette &&other) Q_DECL_NOEXCEPT
+        : d(other.d), data(other.data)
+    { other.d = Q_NULLPTR; }
+    inline QPalette &operator=(QPalette &&other) Q_DECL_NOEXCEPT
     {
         for_faster_swapping_dont_use = other.for_faster_swapping_dont_use;
         qSwap(d, other.d); return *this;
     }
 #endif
 
-    void swap(QPalette &other) {
+    void swap(QPalette &other) Q_DECL_NOEXCEPT
+    {
         qSwap(d, other.d);
         qSwap(for_faster_swapping_dont_use, other.for_faster_swapping_dont_use);
     }
diff --git a/src/gui/painting/qbrush.h b/src/gui/painting/qbrush.h
index a3b88a50ef..ceb95f5676 100644
--- a/src/gui/painting/qbrush.h
+++ b/src/gui/painting/qbrush.h
@@ -73,10 +73,11 @@ public:
     ~QBrush();
     QBrush &operator=(const QBrush &brush);
 #ifdef Q_COMPILER_RVALUE_REFS
-    inline QBrush &operator=(QBrush &&other)
+    inline QBrush &operator=(QBrush &&other) Q_DECL_NOEXCEPT
     { qSwap(d, other.d); return *this; }
 #endif
-    inline void swap(QBrush &other) { qSwap(d, other.d); }
+    inline void swap(QBrush &other) Q_DECL_NOEXCEPT
+    { qSwap(d, other.d); }
 
     operator QVariant() const;
 
diff --git a/src/gui/painting/qpaintdevice.cpp b/src/gui/painting/qpaintdevice.cpp
index 36e0bbe223..bbf8e8f170 100644
--- a/src/gui/painting/qpaintdevice.cpp
+++ b/src/gui/painting/qpaintdevice.cpp
@@ -35,7 +35,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QPaintDevice::QPaintDevice()
+QPaintDevice::QPaintDevice() Q_DECL_NOEXCEPT
 {
     reserved = 0;
     painters = 0;
diff --git a/src/gui/painting/qpaintdevice.h b/src/gui/painting/qpaintdevice.h
index 7c756c66de..4eb972786b 100644
--- a/src/gui/painting/qpaintdevice.h
+++ b/src/gui/painting/qpaintdevice.h
@@ -80,7 +80,7 @@ public:
     int depth() const { return metric(PdmDepth); }
 
 protected:
-    QPaintDevice();
+    QPaintDevice() Q_DECL_NOEXCEPT;
     virtual int metric(PaintDeviceMetric metric) const;
     virtual void initPainter(QPainter *painter) const;
     virtual QPaintDevice *redirected(QPoint *offset) const;
diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp
index e3c6eabbc3..88cf05c646 100644
--- a/src/gui/painting/qpainterpath.cpp
+++ b/src/gui/painting/qpainterpath.cpp
@@ -521,7 +521,7 @@ void QPainterPath::setElementPositionAt(int i, qreal x, qreal y)
 /*!
     Constructs an empty QPainterPath object.
 */
-QPainterPath::QPainterPath()
+QPainterPath::QPainterPath() Q_DECL_NOEXCEPT
     : d_ptr(0)
 {
 }
diff --git a/src/gui/painting/qpainterpath.h b/src/gui/painting/qpainterpath.h
index eb32782a96..e037cd5bfb 100644
--- a/src/gui/painting/qpainterpath.h
+++ b/src/gui/painting/qpainterpath.h
@@ -81,16 +81,16 @@ public:
         inline bool operator!=(const Element &e) const { return !operator==(e); }
     };
 
-    QPainterPath();
+    QPainterPath() Q_DECL_NOEXCEPT;
     explicit QPainterPath(const QPointF &startPoint);
     QPainterPath(const QPainterPath &other);
     QPainterPath &operator=(const QPainterPath &other);
 #ifdef Q_COMPILER_RVALUE_REFS
-    inline QPainterPath &operator=(QPainterPath &&other)
+    inline QPainterPath &operator=(QPainterPath &&other) Q_DECL_NOEXCEPT
     { qSwap(d_ptr, other.d_ptr); return *this; }
 #endif
     ~QPainterPath();
-    inline void swap(QPainterPath &other) { d_ptr.swap(other.d_ptr); }
+    inline void swap(QPainterPath &other) Q_DECL_NOEXCEPT { d_ptr.swap(other.d_ptr); }
 
     void closeSubpath();
 
diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h
index bab07b5a5d..ab2404e887 100644
--- a/src/gui/painting/qregion.h
+++ b/src/gui/painting/qregion.h
@@ -66,10 +66,10 @@ public:
     ~QRegion();
     QRegion &operator=(const QRegion &);
 #ifdef Q_COMPILER_RVALUE_REFS
-    inline QRegion &operator=(QRegion &&other)
+    inline QRegion &operator=(QRegion &&other) Q_DECL_NOEXCEPT
     { qSwap(d, other.d); return *this; }
 #endif
-    inline void swap(QRegion &other) { qSwap(d, other.d); }
+    inline void swap(QRegion &other) Q_DECL_NOEXCEPT { qSwap(d, other.d); }
     bool isEmpty() const;
     bool isNull() const;
 
diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h
index cc78ea7f45..72e4197fc5 100644
--- a/src/gui/text/qfont.h
+++ b/src/gui/text/qfont.h
@@ -237,7 +237,7 @@ public:
     operator QVariant() const;
     bool isCopyOf(const QFont &) const;
 #ifdef Q_COMPILER_RVALUE_REFS
-    inline QFont &operator=(QFont &&other)
+    inline QFont &operator=(QFont &&other) Q_DECL_NOEXCEPT
     { qSwap(d, other.d); qSwap(resolve_mask, other.resolve_mask);  return *this; }
 #endif
 
diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h
index 12aa2dadb4..65ec219a99 100644
--- a/src/gui/text/qfontmetrics.h
+++ b/src/gui/text/qfontmetrics.h
@@ -58,11 +58,12 @@ public:
 
     QFontMetrics &operator=(const QFontMetrics &);
 #ifdef Q_COMPILER_RVALUE_REFS
-    inline QFontMetrics &operator=(QFontMetrics &&other)
+    inline QFontMetrics &operator=(QFontMetrics &&other) Q_DECL_NOEXCEPT
     { qSwap(d, other.d); return *this; }
 #endif
 
-    void swap(QFontMetrics &other) { qSwap(d, other.d); }
+    void swap(QFontMetrics &other) Q_DECL_NOEXCEPT
+    { qSwap(d, other.d); }
 
     int ascent() const;
     int descent() const;
-- 
cgit v1.2.3