diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2015-01-08 14:45:11 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2015-01-10 08:43:09 +0100 |
| commit | 2c2801860dde4d707af9ce291489bee1750955d1 (patch) | |
| tree | 32862c9d582270b4a0b26dd873e2fa7c8a1121d3 /src | |
| parent | 676cb678cc7826366429761d2b3e57a052c1d868 (diff) | |
QPen: mark copy/move/swap as nothrow
Change-Id: Ib13d60256d96253934e0627d4c3015248e002e3f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qpen.cpp | 4 | ||||
| -rw-r--r-- | src/gui/painting/qpen.h | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/painting/qpen.cpp b/src/gui/painting/qpen.cpp index c3bc7964a3..5679c600ba 100644 --- a/src/gui/painting/qpen.cpp +++ b/src/gui/painting/qpen.cpp @@ -316,7 +316,7 @@ QPen::QPen(const QBrush &brush, qreal width, Qt::PenStyle s, Qt::PenCapStyle c, Constructs a pen that is a copy of the given \a pen. */ -QPen::QPen(const QPen &p) +QPen::QPen(const QPen &p) Q_DECL_NOTHROW { d = p.d; if (d) @@ -375,7 +375,7 @@ void QPen::detach() this pen. */ -QPen &QPen::operator=(const QPen &p) +QPen &QPen::operator=(const QPen &p) Q_DECL_NOTHROW { QPen(p).swap(*this); return *this; diff --git a/src/gui/painting/qpen.h b/src/gui/painting/qpen.h index 30f55cd4ce..48b7379924 100644 --- a/src/gui/painting/qpen.h +++ b/src/gui/painting/qpen.h @@ -58,18 +58,18 @@ public: QPen(const QColor &color); QPen(const QBrush &brush, qreal width, Qt::PenStyle s = Qt::SolidLine, Qt::PenCapStyle c = Qt::SquareCap, Qt::PenJoinStyle j = Qt::BevelJoin); - QPen(const QPen &pen); + QPen(const QPen &pen) Q_DECL_NOTHROW; ~QPen(); - QPen &operator=(const QPen &pen); + QPen &operator=(const QPen &pen) Q_DECL_NOTHROW; #ifdef Q_COMPILER_RVALUE_REFS - inline QPen(QPen &&other) + QPen(QPen &&other) Q_DECL_NOTHROW : d(other.d) { other.d = 0; } - inline QPen &operator=(QPen &&other) + QPen &operator=(QPen &&other) Q_DECL_NOTHROW { qSwap(d, other.d); return *this; } #endif - inline void swap(QPen &other) { qSwap(d, other.d); } + void swap(QPen &other) Q_DECL_NOTHROW { qSwap(d, other.d); } Qt::PenStyle style() const; void setStyle(Qt::PenStyle); |