summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
authorGeir Vattekar <geir.vattekar@digia.com>2013-09-26 12:16:39 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-27 21:47:55 +0200
commit3705c1263d4d2232d5527361692d25a8519c222b (patch)
tree3d89fde7ca666151ff674f86d734c7ef02e9cd3e /src/gui/image
parenta0792f0e5135588437ed76d4d0e257a276fd80da (diff)
Doc: Add docs for rvalue references and move constructors
These members were introduced in 4.8, but left undocumented. Because we consider undocumented API to be internal, the members are \since 5.2. Change-Id: I52e2840a8cfaa7f59f410b3e2a06c0942ea06539 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/qicon.cpp8
-rw-r--r--src/gui/image/qimage.cpp17
-rw-r--r--src/gui/image/qpicture.cpp8
-rw-r--r--src/gui/image/qpixmap.cpp8
4 files changed, 41 insertions, 0 deletions
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