From 4c704fad089ddd92e9d274faa5a840dd96349ca1 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 1 Dec 2017 15:46:45 +0100 Subject: 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 --- src/corelib/kernel/qobjectdefs.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src') 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 -- cgit v1.2.3