From b90eaa3bb516f00feaa5ee2bf4f0dd6fe4ec0d9a Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Fri, 31 Jan 2020 19:55:52 +0800 Subject: Examples: Replace deprecated QLabel API Task-number: QTBUG-48701 Change-Id: I6fc875a35dfc3bf4d906d0f0e495c18ef566d1e1 Reviewed-by: Friedemann Kleint Reviewed-by: Paul Wicking --- examples/widgets/widgets/imageviewer/imageviewer.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'examples/widgets/widgets/imageviewer/imageviewer.cpp') diff --git a/examples/widgets/widgets/imageviewer/imageviewer.cpp b/examples/widgets/widgets/imageviewer/imageviewer.cpp index 83cf8bb7bc..1efaad0082 100644 --- a/examples/widgets/widgets/imageviewer/imageviewer.cpp +++ b/examples/widgets/widgets/imageviewer/imageviewer.cpp @@ -200,19 +200,20 @@ void ImageViewer::saveAs() void ImageViewer::print() //! [5] //! [6] { - Q_ASSERT(imageLabel->pixmap()); + Q_ASSERT(!imageLabel->pixmap(Qt::ReturnByValue).isNull()); #if QT_CONFIG(printdialog) //! [6] //! [7] QPrintDialog dialog(&printer, this); //! [7] //! [8] if (dialog.exec()) { QPainter painter(&printer); + QPixmap pixmap = imageLabel->pixmap(Qt::ReturnByValue); QRect rect = painter.viewport(); - QSize size = imageLabel->pixmap()->size(); + QSize size = pixmap.size(); size.scale(rect.size(), Qt::KeepAspectRatio); painter.setViewport(rect.x(), rect.y(), size.width(), size.height()); - painter.setWindow(imageLabel->pixmap()->rect()); - painter.drawPixmap(0, 0, *imageLabel->pixmap()); + painter.setWindow(pixmap.rect()); + painter.drawPixmap(0, 0, pixmap); } #endif } @@ -383,9 +384,8 @@ void ImageViewer::updateActions() void ImageViewer::scaleImage(double factor) //! [23] //! [24] { - Q_ASSERT(imageLabel->pixmap()); scaleFactor *= factor; - imageLabel->resize(scaleFactor * imageLabel->pixmap()->size()); + imageLabel->resize(scaleFactor * imageLabel->pixmap(Qt::ReturnByValue).size()); adjustScrollBar(scrollArea->horizontalScrollBar(), factor); adjustScrollBar(scrollArea->verticalScrollBar(), factor); -- cgit v1.2.3