whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QPixmap: use rvalue overloads more 

Change-Id: Icf19d20bf46f575ba020e308e0822164ed9924cf
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
bb10
Anton Kudryavtsev 2018-02-06 18:16:38 +03:00 committed by Anton Kudryavtsev
parent ae273bcf42
commit a36031ace3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/image/qpixmap.cpp
View File

@ -248,9 +248,9 @@ QPixmap::QPixmap(const char * const xpm[])
QImage image(xpm);
if (!image.isNull()) {
if (data && data->pixelType() == QPlatformPixmap::BitmapType)
*this = QBitmap::fromImage(image);
*this = QBitmap::fromImage(std::move(image));
else
*this = fromImage(image);
*this = fromImage(std::move(image));
}
}
#endif
@ -691,7 +691,7 @@ QBitmap QPixmap::createHeuristicMask(bool clipTight) const
QBitmap QPixmap::createMaskFromColor(const QColor &maskColor, Qt::MaskMode mode) const
{
QImage image = toImage().convertToFormat(QImage::Format_ARGB32);
return QBitmap::fromImage(image.createMaskFromColor(maskColor.rgba(), mode));
return QBitmap::fromImage(std::move(image).createMaskFromColor(maskColor.rgba(), mode));
}
/*!
@ -1018,9 +1018,9 @@ QDataStream &operator>>(QDataStream &stream, QPixmap &pixmap)
if (image.isNull()) {
pixmap = QPixmap();
} else if (image.depth() == 1) {
pixmap = QBitmap::fromImage(image);
pixmap = QBitmap::fromImage(std::move(image));
} else {
pixmap = QPixmap::fromImage(image);
pixmap = QPixmap::fromImage(std::move(image));
}
return stream;
}