diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2015-06-25 18:41:14 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2015-06-30 07:20:50 +0000 |
| commit | f815676b7d46cfe6e79985dee9fce182edb346d7 (patch) | |
| tree | 26f277f5d637753f35358e03a31957e7060e6f2f /src/corelib/io/qdir.h | |
| parent | 20147fae60fd062788c51b058ebb70b33d7fd664 (diff) | |
QtCore: make all Q_DECLARE_SHARED types nothrow move-assignable
Excepting QDebug, which doesn't have value semantics.
Change-Id: I43757ef7bba4c1f5b6de9144f12b38ce840cd9f9
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/io/qdir.h')
| -rw-r--r-- | src/corelib/io/qdir.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h index b6946eba65..ab3a331229 100644 --- a/src/corelib/io/qdir.h +++ b/src/corelib/io/qdir.h @@ -101,11 +101,10 @@ public: QDir &operator=(const QDir &); QDir &operator=(const QString &path); #ifdef Q_COMPILER_RVALUE_REFS - inline QDir &operator=(QDir &&other) - { qSwap(d_ptr, other.d_ptr); return *this; } + QDir &operator=(QDir &&other) Q_DECL_NOTHROW { swap(other); return *this; } #endif - inline void swap(QDir &other) + void swap(QDir &other) Q_DECL_NOTHROW { qSwap(d_ptr, other.d_ptr); } void setPath(const QString &path); |