summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-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
-rw-r--r--src/gui/kernel/qcursor.cpp8
-rw-r--r--src/gui/kernel/qkeysequence.cpp8
-rw-r--r--src/gui/kernel/qpalette.cpp8
-rw-r--r--src/gui/painting/qbrush.cpp7
-rw-r--r--src/gui/painting/qpainterpath.cpp8
-rw-r--r--src/gui/painting/qpen.cpp8
-rw-r--r--src/gui/painting/qregion.cpp8
-rw-r--r--src/gui/text/qfont.cpp8
-rw-r--r--src/gui/text/qfontmetrics.cpp8
13 files changed, 112 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
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