diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2017-12-01 15:46:45 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2017-12-01 18:52:14 +0000 |
| commit | 4c704fad089ddd92e9d274faa5a840dd96349ca1 (patch) | |
| tree | ac273cdb71c9cb7f7cef184830eb2b1c6c9d9d75 /src/corelib/kernel/qobjectdefs.h | |
| parent | 15557a12de494c183e3cc359db434f757bb7f459 (diff) | |
QMetaObject::Connection: mark move ctors Q_DECL_NOTHROW
Drop the #ifdef Q_COMPILER_RVALUE_REFS - we require that since Qt 5.7.
Change-Id: Ib4c6f559b014915f43875ec6791bfda3f24a109b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qobjectdefs.h')
| -rw-r--r-- | src/corelib/kernel/qobjectdefs.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index 6cd0e82a86..b5f7a21565 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -614,11 +614,9 @@ public: operator RestrictedBool() const { return d_ptr && isConnected_helper() ? &Connection::d_ptr : nullptr; } #endif -#ifdef Q_COMPILER_RVALUE_REFS - inline Connection(Connection &&o) : d_ptr(o.d_ptr) { o.d_ptr = nullptr; } - inline Connection &operator=(Connection &&other) + Connection(Connection &&o) Q_DECL_NOTHROW : d_ptr(o.d_ptr) { o.d_ptr = nullptr; } + Connection &operator=(Connection &&other) Q_DECL_NOTHROW { qSwap(d_ptr, other.d_ptr); return *this; } -#endif }; inline const QMetaObject *QMetaObject::superClass() const |