diff options
5 files changed, 11 insertions, 11 deletions
diff --git a/examples/widgets/desktop/screenshot/screenshot.cpp b/examples/widgets/desktop/screenshot/screenshot.cpp index ce5597bbdd..d0a849e0b8 100644 --- a/examples/widgets/desktop/screenshot/screenshot.cpp +++ b/examples/widgets/desktop/screenshot/screenshot.cpp @@ -109,7 +109,7 @@ void Screenshot::resizeEvent(QResizeEvent * /* event */) { QSize scaledSize = originalPixmap.size(); scaledSize.scale(screenshotLabel->size(), Qt::KeepAspectRatio); - if (!screenshotLabel->pixmap() || scaledSize != screenshotLabel->pixmap()->size()) + if (scaledSize != screenshotLabel->pixmap(Qt::ReturnByValue).size()) updateScreenshotLabel(); } //! [1] diff --git a/examples/widgets/doc/src/imageviewer.qdoc b/examples/widgets/doc/src/imageviewer.qdoc index 91b6385356..8cf8c2489e 100644 --- a/examples/widgets/doc/src/imageviewer.qdoc +++ b/examples/widgets/doc/src/imageviewer.qdoc @@ -175,8 +175,8 @@ will expand to \code - if (!imageLabel->pixmap()) - qFatal("ASSERT: "imageLabel->pixmap()" in file ..."); + if (imageLabel->pixmap(Qt::ReturnByValue).isNull()) + qFatal("ASSERT: "imageLabel->pixmap(Qt::ReturnByValue).isNull()" in file ..."); \endcode In release mode, the macro simply disappear. The mode can be set diff --git a/examples/widgets/draganddrop/draggableicons/dragwidget.cpp b/examples/widgets/draganddrop/draggableicons/dragwidget.cpp index 2019645c1d..00671dcf7e 100644 --- a/examples/widgets/draganddrop/draggableicons/dragwidget.cpp +++ b/examples/widgets/draganddrop/draggableicons/dragwidget.cpp @@ -142,7 +142,7 @@ void DragWidget::mousePressEvent(QMouseEvent *event) if (!child) return; - QPixmap pixmap = *child->pixmap(); + QPixmap pixmap = child->pixmap(Qt::ReturnByValue); QByteArray itemData; QDataStream dataStream(&itemData, QIODevice::WriteOnly); diff --git a/examples/widgets/draganddrop/fridgemagnets/dragwidget.cpp b/examples/widgets/draganddrop/fridgemagnets/dragwidget.cpp index 451b53f623..4fbc6d3fd9 100644 --- a/examples/widgets/draganddrop/fridgemagnets/dragwidget.cpp +++ b/examples/widgets/draganddrop/fridgemagnets/dragwidget.cpp @@ -208,7 +208,7 @@ void DragWidget::mousePressEvent(QMouseEvent *event) //! [16] QDrag *drag = new QDrag(this); drag->setMimeData(mimeData); - drag->setPixmap(*child->pixmap()); + drag->setPixmap(child->pixmap(Qt::ReturnByValue)); drag->setHotSpot(hotSpot); child->hide(); 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); |