diff options
34 files changed, 414 insertions, 0 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index cd30533ff8..5af398c360 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -515,6 +515,14 @@ inline void QDirPrivate::initFileEngine() */ /*! + \fn QDir &QDir::operator=(QDir &&other) + + Move-assigns \a other to this QDir instance. + + \since 5.2 +*/ + +/*! \internal */ QDir::QDir(QDirPrivate &p) : d_ptr(&p) diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp index 1d5f16c9d9..d1b7ebac65 100644 --- a/src/corelib/io/qfileinfo.cpp +++ b/src/corelib/io/qfileinfo.cpp @@ -294,6 +294,14 @@ QDateTime &QFileInfoPrivate::getFileTime(QAbstractFileEngine::FileTime request) */ /*! + \fn QFileInfo &QFileInfo::operator=(QFileInfo &&other) + + Move-assigns \a other to this QFileInfo instance. + + \since 5.2 +*/ + +/*! \internal */ QFileInfo::QFileInfo(QFileInfoPrivate *p) : d_ptr(p) diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 5535ae126a..d14add36a5 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -363,6 +363,23 @@ \sa QUrl::FormattingOptions */ +/*! + \fn QUrl::QUrl(QUrl &&other) + + Move-constructs a QUrl instance, making it point at the same + object that \a other was pointing to. + + \since 5.2 +*/ + +/*! + \fn QUrl &QUrl::operator=(QUrl &&other) + + Move-assigns \a other to this QUrl instance. + + \since 5.2 +*/ + #include "qurl.h" #include "qurl_p.h" #include "qplatformdefs.h" diff --git a/src/corelib/io/qurlquery.cpp b/src/corelib/io/qurlquery.cpp index f6b5cd44bd..f773af1433 100644 --- a/src/corelib/io/qurlquery.cpp +++ b/src/corelib/io/qurlquery.cpp @@ -139,6 +139,14 @@ QT_BEGIN_NAMESPACE \sa QUrl */ +/*! + \fn QUrlQuery &QUrlQuery::operator=(QUrlQuery &&other) + + Move-assigns \a other to this QUrlQuery instance. + + \since 5.2 +*/ + typedef QList<QPair<QString, QString> > Map; class QUrlQueryPrivate : public QSharedData diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp index 2ea560e611..2238902abc 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.cpp +++ b/src/corelib/itemmodels/qabstractitemmodel.cpp @@ -107,6 +107,23 @@ void QPersistentModelIndexData::destroy(QPersistentModelIndexData *data) \sa {Model/View Programming}, QModelIndex, QAbstractItemModel */ +/*! + \fn QPersistentModelIndex::QPersistentModelIndex(QPersistentModelIndex &&other) + + Move-constructs a QPersistentModelIndex instance, making it point at the same + object that \a other was pointing to. + + \since 5.2 +*/ + +/*! + \fn QPersistentModelIndex &QPersistentModelIndex::operator=(QPersistentModelIndex &&other) + + Move-assigns \a other to this QPersistentModelIndex instance. + + \since 5.2 +*/ + /*! \fn QPersistentModelIndex::QPersistentModelIndex() diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 75e945a0cc..a7c0bd2321 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -1105,6 +1105,23 @@ Q_CORE_EXPORT void QVariantPrivate::registerHandler(const int /* Modules::Names */ /*! + \fn QVariant::QVariant(QVariant &&other) + + Move-constructs a QVariant instance, making it point at the same + object that \a other was pointing to. + + \since 5.2 +*/ + +/*! + \fn QVariant &QVariant::operator=(QVariant &&other) + + Move-assigns \a other to this QVariant instance. + + \since 5.2 +*/ + +/*! \fn QVariant::QVariant() Constructs an invalid variant. diff --git a/src/corelib/mimetypes/qmimetype.cpp b/src/corelib/mimetypes/qmimetype.cpp index 4dec1ab696..31237797df 100644 --- a/src/corelib/mimetypes/qmimetype.cpp +++ b/src/corelib/mimetypes/qmimetype.cpp @@ -109,6 +109,14 @@ void QMimeTypePrivate::addGlobPattern(const QString &pattern) */ /*! + \fn QMimeType &QMimeType::operator=(QMimeType &&other) + + Move-assigns \a other to this QMimeType instance. + + \since 5.2 +*/ + +/*! \fn QMimeType::QMimeType(); Constructs this QMimeType object initialized with default property values that indicate an invalid MIME type. */ 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 diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index cb508ae6c7..5a37a8fecf 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -644,6 +644,14 @@ QIcon &QIcon::operator=(const QIcon &other) } /*! + \fn QIcon &QIcon::operator=(QIcon &&other) + + Move-assigns \a other to this QIcon instance. + + \since 5.2 +*/ + +/*! \fn void QIcon::swap(QIcon &other) \since 4.8 diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 3d6315a7fe..28af8adf9c 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -602,6 +602,23 @@ bool QImageData::checkForAlphaPixels() const */ /*! + \fn QImage::QImage(QImage &&other) + + Move-constructs a QImage instance, making it point at the same + object that \a other was pointing to. + + \since 5.2 +*/ + +/*! + \fn QImage &operator=(QImage &&other) + + Move-assigns \a other to this QImage instance. + + \since 5.2 +*/ + +/*! \typedef QImageCleanupFunction \relates QImage \since 5.0 diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index be7a1e8001..e11d3bb019 100644 --- a/src/gui/image/qpicture.cpp +++ b/src/gui/image/qpicture.cpp @@ -109,6 +109,14 @@ void qt_format_text(const QFont &fnt, const QRectF &_r, \sa QMovie */ +/*! + \fn QPicture &QPicture::operator=(QPicture &&other) + + Move-assigns \a other to this QPicture instance. + + \since 5.2 +*/ + const char *qt_mfhdr_tag = "QPIC"; // header tag static const quint16 mfhdr_maj = 11; // major version # static const quint16 mfhdr_min = 0; // minor version # diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index f98ca04f4d..bb48a4b3a5 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -392,6 +392,14 @@ QPixmap &QPixmap::operator=(const QPixmap &pixmap) } /*! + \fn QPixmap &QPixmap::operator=(QPixmap &&other) + + Move-assigns \a other to this QPixmap instance. + + \since 5.2 +*/ + +/*! \fn void QPixmap::swap(QPixmap &other) \since 4.8 diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp index d6287aef5c..a33b264704 100644 --- a/src/gui/kernel/qcursor.cpp +++ b/src/gui/kernel/qcursor.cpp @@ -154,6 +154,14 @@ QT_BEGIN_NAMESPACE */ /*! + \fn QCursor &QCursor::operator=(QCursor &&other) + + Move-assigns \a other to this QCursor instance. + + \since 5.2 +*/ + +/*! \fn QPoint QCursor::pos(const QScreen *screen) Returns the position of the cursor (hot spot) of the \a screen diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 16324b3659..1fcf1026d2 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -733,6 +733,14 @@ static const struct { */ /*! + \fn QKeySequence &QKeySequence::operator=(QKeySequence &&other) + + Move-assigns \a other to this QKeySequence instance. + + \since 5.2 +*/ + +/*! \since 4.2 Constructs a QKeySequence object for the given \a key. diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp index b266d31c5c..00ab74e4e4 100644 --- a/src/gui/kernel/qpalette.cpp +++ b/src/gui/kernel/qpalette.cpp @@ -90,6 +90,14 @@ static void qt_palette_from_color(QPalette &pal, const QColor &button) } /*! + \fn QPalette &QPalette::operator=(QPalette &&other) + + Move-assigns \a other to this QPalette instance. + + \since 5.2 +*/ + +/*! \fn const QColor &QPalette::color(ColorRole role) const \overload diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp index 66c3a68c13..4ec47fa4a9 100644 --- a/src/gui/painting/qbrush.cpp +++ b/src/gui/painting/qbrush.cpp @@ -631,6 +631,13 @@ QBrush &QBrush::operator=(const QBrush &b) return *this; } +/*! + \fn QBrush &QBrush::operator=(QBrush &&other) + + Move-assigns \a other to this QBrush instance. + + \since 5.2 +*/ /*! \fn void QBrush::swap(QBrush &other) diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp index 626a91c331..1e36cd224a 100644 --- a/src/gui/painting/qpainterpath.cpp +++ b/src/gui/painting/qpainterpath.cpp @@ -608,6 +608,14 @@ QPainterPath &QPainterPath::operator=(const QPainterPath &other) } /*! + \fn QPainterPath &QPainterPath::operator=(QPainterPath &&other) + + Move-assigns \a other to this QPainterPath instance. + + \since 5.2 +*/ + +/*! \fn void QPainterPath::swap(QPainterPath &other) \since 4.8 diff --git a/src/gui/painting/qpen.cpp b/src/gui/painting/qpen.cpp index 4122322e36..a7c4a0eae1 100644 --- a/src/gui/painting/qpen.cpp +++ b/src/gui/painting/qpen.cpp @@ -378,6 +378,14 @@ QPen &QPen::operator=(const QPen &p) } /*! + \fn QPen &QPen::operator=(QPen &&other) + + Move-assigns \a other to this QPen instance. + + \since 5.2 +*/ + +/*! \fn void QPen::swap(QPen &other) \since 4.8 diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp index 47668c62b6..913daee3e1 100644 --- a/src/gui/painting/qregion.cpp +++ b/src/gui/painting/qregion.cpp @@ -361,6 +361,14 @@ void QRegion::exec(const QByteArray &buffer, int ver, QDataStream::ByteOrder byt */ /*! + \fn QRegion &QRegion::operator=(QRegion &&other) + + Move-assigns \a other to this QRegion instance. + + \since 5.2 +*/ + +/*! \fn void QRegion::swap(QRegion &other) \since 4.8 diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 9d603bb08d..2a9cac352d 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -537,6 +537,14 @@ QFontEngineData::~QFontEngineData() */ /*! + \fn QFont &QFont::operator=(QFont &&other) + + Move-assigns \a other to this QFont instance. + + \since 5.2 +*/ + +/*! \fn QString QFont::rawName() const Returns the name of the font within the underlying window system. diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp index 160d66c96c..1d0a1c1078 100644 --- a/src/gui/text/qfontmetrics.cpp +++ b/src/gui/text/qfontmetrics.cpp @@ -213,6 +213,14 @@ QFontMetrics &QFontMetrics::operator=(const QFontMetrics &fm) } /*! + \fn QFontMetrics &QFontMetrics::operator=(QFontMetrics &&other) + + Move-assigns \a other to this QFontMetrics instance. + + \since 5.2 +*/ + +/*! \fn void QFontMetrics::swap(QFontMetrics &other) \since 5.0 |