summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/tools')
-rw-r--r--src/corelib/tools/qbitarray.cpp17
-rw-r--r--src/corelib/tools/qbytearray.cpp17
-rw-r--r--src/corelib/tools/qcommandlineoption.cpp8
-rw-r--r--src/corelib/tools/qcontiguouscache.cpp8
-rw-r--r--src/corelib/tools/qeasingcurve.cpp17
-rw-r--r--src/corelib/tools/qhash.cpp17
-rw-r--r--src/corelib/tools/qlinkedlist.cpp17
-rw-r--r--src/corelib/tools/qlist.cpp17
-rw-r--r--src/corelib/tools/qmap.cpp17
-rw-r--r--src/corelib/tools/qregexp.cpp8
-rw-r--r--src/corelib/tools/qshareddata.cpp34
-rw-r--r--src/corelib/tools/qstring.cpp16
-rw-r--r--src/corelib/tools/qtimezone.cpp9
-rw-r--r--src/corelib/tools/qvector.cpp17
14 files changed, 219 insertions, 0 deletions
diff --git a/src/corelib/tools/qbitarray.cpp b/src/corelib/tools/qbitarray.cpp
index da2f48c071..4f1fce3077 100644
--- a/src/corelib/tools/qbitarray.cpp
+++ b/src/corelib/tools/qbitarray.cpp
@@ -110,6 +110,23 @@ QT_BEGIN_NAMESPACE
\sa QByteArray, QVector
*/
+/*!
+ \fn QBitArray::QBitArray(QBitArray &&other)
+
+ Move-constructs a QBitArray instance, making it point at the same
+ object that \a other was pointing to.
+
+ \since 5.2
+*/
+
+/*!
+ \fn QBitArray &QBitArray::operator=(QBitArray &&other)
+
+ Move-assigns \a other to this QBitArray instance.
+
+ \since 5.2
+*/
+
/*! \fn QBitArray::QBitArray()
Constructs an empty bit array.
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp
index 975894a516..92d0d30f54 100644
--- a/src/corelib/tools/qbytearray.cpp
+++ b/src/corelib/tools/qbytearray.cpp
@@ -910,6 +910,15 @@ static inline char qToLower(char c)
\sa operator=()
*/
+/*!
+ \fn QByteArray::QByteArray(QByteArray &&other)
+
+ Move-constructs a QByteArray instance, making it point at the same
+ object that \a other was pointing to.
+
+ \since 5.2
+*/
+
/*! \fn QByteArray::QByteArray(QByteArrayDataPtr dd)
\internal
@@ -965,6 +974,14 @@ QByteArray &QByteArray::operator=(const char *str)
return *this;
}
+/*!
+ \fn QByteArray &QByteArray::operator=(QByteArray &&other)
+
+ Move-assigns \a other to this QByteArray instance.
+
+ \since 5.2
+*/
+
/*! \fn void QByteArray::swap(QByteArray &other)
\since 4.8
diff --git a/src/corelib/tools/qcommandlineoption.cpp b/src/corelib/tools/qcommandlineoption.cpp
index b30f7d25b4..9827547c56 100644
--- a/src/corelib/tools/qcommandlineoption.cpp
+++ b/src/corelib/tools/qcommandlineoption.cpp
@@ -88,6 +88,14 @@ public:
*/
/*!
+ \fn QCommandLineOption &QCommandLineOption::operator=(QCommandLineOption &&other)
+
+ Move-assigns \a other to this QCommandLineOption instance.
+
+ \since 5.2
+*/
+
+/*!
Constructs a command line option object with the given arguments.
The name of the option is set to \a name.
diff --git a/src/corelib/tools/qcontiguouscache.cpp b/src/corelib/tools/qcontiguouscache.cpp
index b92c4d3fe9..6ccdb7b771 100644
--- a/src/corelib/tools/qcontiguouscache.cpp
+++ b/src/corelib/tools/qcontiguouscache.cpp
@@ -202,6 +202,14 @@ MyRecord record(int row) const
Assigns \a other to this cache and returns a reference to this cache.
*/
+/*!
+ \fn QContiguousCache<T> &QContiguousCache::operator=(QContiguousCache<T> &&other)
+
+ Move-assigns \a other to this QContiguousCache instance.
+
+ \since 5.2
+*/
+
/*! \fn void QContiguousCache::swap(QContiguousCache<T> &other)
\since 4.8
diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp
index 23451f095c..fc9a1ca867 100644
--- a/src/corelib/tools/qeasingcurve.cpp
+++ b/src/corelib/tools/qeasingcurve.cpp
@@ -1066,6 +1066,15 @@ static QEasingCurveFunction *curveToFunctionObject(QEasingCurve::Type type)
}
/*!
+ \fn QEasingCurve::QEasingCurve(QEasingCurve &&other)
+
+ Move-constructs a QEasingCurve instance, making it point at the same
+ object that \a other was pointing to.
+
+ \since 5.2
+*/
+
+/*!
Constructs an easing curve of the given \a type.
*/
QEasingCurve::QEasingCurve(Type type)
@@ -1098,6 +1107,14 @@ QEasingCurve::~QEasingCurve()
*/
/*!
+ \fn QEasingCurve &QEasingCurve::operator=(QEasingCurve &&other)
+
+ Move-assigns \a other to this QEasingCurve instance.
+
+ \since 5.2
+*/
+
+/*!
\fn void QEasingCurve::swap(QEasingCurve &other)
\since 5.0
diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp
index 4b9d120bb3..b6257c8907 100644
--- a/src/corelib/tools/qhash.cpp
+++ b/src/corelib/tools/qhash.cpp
@@ -941,6 +941,15 @@ void QHashData::checkSanity()
\sa clear()
*/
+/*!
+ \fn QHash::QHash(QHash<Key, T> &&other)
+
+ Move-constructs a QHash instance, making it point at the same
+ object that \a other was pointing to.
+
+ \since 5.2
+*/
+
/*! \fn QHash::QHash(std::initializer_list<std::pair<Key,T> > list)
\since 5.1
@@ -974,6 +983,14 @@ void QHashData::checkSanity()
Assigns \a other to this hash and returns a reference to this hash.
*/
+/*!
+ \fn QHash<Key, T> &QHash::operator=(QHash<Key, T> &&other)
+
+ Move-assigns \a other to this QHash instance.
+
+ \since 5.2
+*/
+
/*! \fn void QHash::swap(QHash<Key, T> &other)
\since 4.8
diff --git a/src/corelib/tools/qlinkedlist.cpp b/src/corelib/tools/qlinkedlist.cpp
index 6e7a7a2635..c6e79c02a3 100644
--- a/src/corelib/tools/qlinkedlist.cpp
+++ b/src/corelib/tools/qlinkedlist.cpp
@@ -125,6 +125,15 @@ const QLinkedListData QLinkedListData::shared_null = {
Constructs an empty list.
*/
+/*!
+ \fn QLinkedList::QLinkedList(QLinkedList<T> &&other)
+
+ Move-constructs a QLinkedList instance, making it point at the same
+ object that \a other was pointing to.
+
+ \since 5.2
+*/
+
/*! \fn QLinkedList::QLinkedList(const QLinkedList<T> &other)
Constructs a copy of \a other.
@@ -740,6 +749,14 @@ const QLinkedListData QLinkedListData::shared_null = {
Assigns \a other to this iterator.
*/
+/*!
+ \fn QLinkedList<T> &QLinkedList::operator=(QLinkedList<T> &&other)
+
+ Move-assigns \a other to this QLinkedList instance.
+
+ \since 5.2
+*/
+
/*! \fn T &QLinkedList::iterator::operator*() const
Returns a modifiable reference to the current item.
diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp
index 760c944c29..4770054d79 100644
--- a/src/corelib/tools/qlist.cpp
+++ b/src/corelib/tools/qlist.cpp
@@ -480,6 +480,15 @@ void **QListData::erase(void **xi)
*/
/*!
+ \fn QList::QList(QList<T> &&other)
+
+ Move-constructs a QList instance, making it point at the same
+ object that \a other was pointing to.
+
+ \since 5.2
+*/
+
+/*!
\fn QList<T> QList<T>::mid(int pos, int length) const
Returns a list whose elements are copied from this list,
@@ -527,6 +536,14 @@ void **QListData::erase(void **xi)
list.
*/
+/*!
+ \fn QList &QList::operator=(QList<T> &&other)
+
+ Move-assigns \a other to this QList instance.
+
+ \since 5.2
+*/
+
/*! \fn void QList::swap(QList<T> &other)
\since 4.8
diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp
index 71b90bcada..01a6a22631 100644
--- a/src/corelib/tools/qmap.cpp
+++ b/src/corelib/tools/qmap.cpp
@@ -516,6 +516,15 @@ void QMapDataBase::freeData(QMapDataBase *d)
\sa clear()
*/
+/*!
+ \fn QMap::QMap(QMap<Key, T> &&other)
+
+ Move-constructs a QMap instance, making it point at the same
+ object that \a other was pointing to.
+
+ \since 5.2
+*/
+
/*! \fn QMap::QMap(const QMap<Key, T> &other)
Constructs a copy of \a other.
@@ -567,6 +576,14 @@ void QMapDataBase::freeData(QMapDataBase *d)
Assigns \a other to this map and returns a reference to this map.
*/
+/*!
+ \fn QMap<Key, T> &QMap::operator=(QMap<Key, T> &&other)
+
+ Move-assigns \a other to this QMap instance.
+
+ \since 5.2
+*/
+
/*! \fn void QMap::swap(QMap<Key, T> &other)
\since 4.8
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp
index ef2dba5700..5debb1a238 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/tools/qregexp.cpp
@@ -4013,6 +4013,14 @@ QRegExp &QRegExp::operator=(const QRegExp &rx)
}
/*!
+ \fn QRegExp &QRegExp::operator=(QRegExp &&other)
+
+ Move-assigns \a other to this QRegExp instance.
+
+ \since 5.2
+*/
+
+/*!
\fn void QRegExp::swap(QRegExp &other)
\since 4.8
diff --git a/src/corelib/tools/qshareddata.cpp b/src/corelib/tools/qshareddata.cpp
index cee0c1d450..0afda357a6 100644
--- a/src/corelib/tools/qshareddata.cpp
+++ b/src/corelib/tools/qshareddata.cpp
@@ -306,6 +306,14 @@ QT_BEGIN_NAMESPACE
data pointer in \a other.
*/
+/*!
+ \fn QSharedDataPointer<T> &QSharedDataPointer::operator=(QSharedDataPointer<T> &&other)
+
+ Move-assigns \a other to this QSharedDataPointer instance.
+
+ \since 5.2
+*/
+
/*! \fn bool QSharedDataPointer::operator==(const QSharedDataPointer<T>& other) const
Returns true if \a other and \e this have the same \e{d pointer}.
This function does \e not call detach().
@@ -320,6 +328,15 @@ QT_BEGIN_NAMESPACE
Constructs a QSharedDataPointer initialized with a null \e{d pointer}.
*/
+/*!
+ \fn QSharedDataPointer::QSharedDataPointer(QSharedDataPointer &&o)
+
+ Move-constructs a QSharedDataPointer instance, making it point at the same
+ object that \a o was pointing to.
+
+ \since 5.2
+*/
+
/*! \fn QSharedDataPointer::~QSharedDataPointer()
Decrements the reference count of the shared data object.
If the reference count becomes 0, the shared data object
@@ -465,6 +482,14 @@ QT_BEGIN_NAMESPACE
Returns true if \a other and \e this have the same \e{d pointer}.
*/
+/*!
+ \fn QExplicitlySharedDataPointer<T> &QExplicitlySharedDataPointer::operator=(QExplicitlySharedDataPointer<T> &&other)
+
+ Move-assigns \a other to this QExplicitlySharedDataPointer instance.
+
+ \since 5.2
+*/
+
/*! \fn bool QExplicitlySharedDataPointer::operator==(const T* ptr) const
Returns true if the \e{d pointer} of \e this is \a ptr.
*/
@@ -489,6 +514,15 @@ QT_BEGIN_NAMESPACE
is deleted. \e This is then destroyed.
*/
+/*!
+ \fn QExplicitlySharedDataPointer::QExplicitlySharedDataPointer(QExplicitlySharedDataPointer &&o)
+
+ Move-constructs a QExplicitlySharedDataPointer instance, making it point at the same
+ object that \a o was pointing to.
+
+ \since 5.2
+*/
+
/*! \fn QExplicitlySharedDataPointer::QExplicitlySharedDataPointer(T* sharedData)
Constructs a QExplicitlySharedDataPointer with \e{d pointer}
set to \a sharedData and increments \a{sharedData}'s reference
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 239cf0446a..1ba9e81b59 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -929,6 +929,15 @@ const QString::Null QString::null = { };
\sa isEmpty()
*/
+/*!
+ \fn QString::QString(QString &&other)
+
+ Move-constructs a QString instance, making it point at the same
+ object that \a other was pointing to.
+
+ \since 5.2
+*/
+
/*! \fn QString::QString(const char *str)
Constructs a string initialized with the 8-bit string \a str. The
@@ -1349,6 +1358,13 @@ QString &QString::operator=(const QString &other)
return *this;
}
+/*!
+ \fn QString &QString::operator=(QString &&other)
+
+ Move-assigns \a other to this QString instance.
+
+ \since 5.2
+*/
/*! \fn QString &QString::operator=(QLatin1String str)
diff --git a/src/corelib/tools/qtimezone.cpp b/src/corelib/tools/qtimezone.cpp
index cdd0aba102..762ad6fd09 100644
--- a/src/corelib/tools/qtimezone.cpp
+++ b/src/corelib/tools/qtimezone.cpp
@@ -423,6 +423,15 @@ QTimeZone &QTimeZone::operator=(const QTimeZone &other)
}
/*!
+ \fn QTimeZone &QTimeZone::operator=(QTimeZone &&other)
+
+ Move-assigns \a other to this QTimeZone instance, transferring the
+ ownership of the managed pointer to this instance.
+
+ \since 5.2
+*/
+
+/*!
Returns true if this time zone is equal to the \a other time zone.
*/
diff --git a/src/corelib/tools/qvector.cpp b/src/corelib/tools/qvector.cpp
index a443a6b4e8..8982e797d9 100644
--- a/src/corelib/tools/qvector.cpp
+++ b/src/corelib/tools/qvector.cpp
@@ -195,6 +195,15 @@
\sa resize()
*/
+/*!
+ \fn QVector::QVector(QVector<T> &&other)
+
+ Move-constructs a QVector instance, making it point at the same
+ object that \a other was pointing to.
+
+ \since 5.2
+*/
+
/*! \fn QVector::QVector(int size)
Constructs a vector with an initial size of \a size elements.
@@ -246,6 +255,14 @@
vector.
*/
+/*!
+ \fn QVector<T> &QVector::operator=(QVector<T> &&other)
+
+ Move-assigns \a other to this QVector instance.
+
+ \since 5.2
+*/
+
/*! \fn void QVector::swap(QVector<T> &other)
\since 4.8