From f92fdd190d056fe929f723e3f2ce9e0c0b141cec Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Sun, 22 Apr 2012 22:04:46 +0200 Subject: Implement the move constructor for containers. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This changes all the containers that uses QtPrivate::RefCount (QMap already had one), and QVariant In Qt 4.8, it was pointless to have the move constructor because we did not have quick way to re-initialize a null container. (shared_null still needed to be refcounted) But now that we have RefCount, and that the shared_null do not have reference count, we can implement a fast move constructor that do not generate code to increment the reference count. Change-Id: I2bc3c6ae96983f08aa7b1c7cb98d44a89255160b Reviewed-by: Jędrzej Nowacki --- src/corelib/tools/qstring.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/corelib/tools/qstring.h') diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index 61b7264296..7b6d7842cc 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -198,6 +198,7 @@ public: QString &operator=(const QString &); inline QString &operator=(const QLatin1String &); #ifdef Q_COMPILER_RVALUE_REFS + inline QString(QString && other) : d(other.d) { other.d = Data::sharedNull(); } inline QString &operator=(QString &&other) { qSwap(d, other.d); return *this; } #endif -- cgit v1.2.3