1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QPixmap: use rvalue more

Browse Source 
Change-Id: Ifb8c014abf6e02dc782fab2d653e4edfc4972125
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
Anton Kudryavtsev 2018-10-10 14:29:38 +03:00 committed by Anton Kudryavtsev
parent f864a62ccd
commit 02f7caaa7d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/image/qpixmap_win.cpp
View File

@ -449,8 +449,7 @@ Q_GUI_EXPORT QImage qt_imageFromWinHBITMAP(HBITMAP bitmap, int hbitmapFormat = 0
Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP bitmap, int hbitmapFormat = 0) Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP bitmap, int hbitmapFormat = 0)
{ {
const QImage image = imageFromWinHBITMAP_GetDiBits(bitmap, /* forceQuads */ true, hbitmapFormat); return QPixmap::fromImage(imageFromWinHBITMAP_GetDiBits(bitmap, /* forceQuads */ true, hbitmapFormat));
return QPixmap::fromImage(image);
} }
Q_GUI_EXPORT HICON qt_pixmapToWinHICON(const QPixmap &p) Q_GUI_EXPORT HICON qt_pixmapToWinHICON(const QPixmap &p)
@ -567,7 +566,7 @@ Q_GUI_EXPORT QPixmap qt_pixmapFromWinHICON(HICON icon)
SelectObject(hdc, oldhdc); //restore state SelectObject(hdc, oldhdc); //restore state
DeleteObject(winBitmap); DeleteObject(winBitmap);
DeleteDC(hdc); DeleteDC(hdc);
return QPixmap::fromImage(image); return QPixmap::fromImage(std::move(image));
} }
QT_END_NAMESPACE QT_END_NAMESPACE