summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qstring.h
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2012-04-22 22:04:46 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-11 01:42:02 +0200
commitf92fdd190d056fe929f723e3f2ce9e0c0b141cec (patch)
tree55590a2a6fd346031c8950a13b9ddccf640fc485 /src/corelib/tools/qstring.h
parent7226361aed3259b7f4b68e1836f17b3e698c30af (diff)
Implement the move constructor for containers.
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 <jedrzej.nowacki@nokia.com>
Diffstat (limited to 'src/corelib/tools/qstring.h')
-rw-r--r--src/corelib/tools/qstring.h1
1 files changed, 1 insertions, 0 deletions
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