From 8a0d93ba940113f3bb999be1a023a31588f3ffea Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 10 Nov 2022 22:10:52 +0200 Subject: [PATCH] replace QPixmapData::createCompatiblePixmapData() with its body Signed-off-by: Ivailo Monev --- src/gui/image/qpixmap.cpp | 2 +- src/gui/image/qpixmapdata.cpp | 5 ----- src/gui/image/qpixmapdata_p.h | 2 -- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 683051d5f..4d57846e7 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -212,7 +212,7 @@ QPixmap QPixmap::copy(const QRect &rect) const if (!rect.isEmpty()) r = r.intersected(rect); - QPixmapData *d = data->createCompatiblePixmapData(); + QPixmapData *d = new QPixmapData(data->pixelType()); d->copy(data.data(), r); return QPixmap(d); } diff --git a/src/gui/image/qpixmapdata.cpp b/src/gui/image/qpixmapdata.cpp index 6652c73f0..aa8e0f0fd 100644 --- a/src/gui/image/qpixmapdata.cpp +++ b/src/gui/image/qpixmapdata.cpp @@ -79,11 +79,6 @@ QPixmapData::~QPixmapData() { } -QPixmapData *QPixmapData::createCompatiblePixmapData() const -{ - return new QPixmapData(pixelType()); -} - void QPixmapData::fromImageReader(QImageReader *imageReader, Qt::ImageConversionFlags flags) { diff --git a/src/gui/image/qpixmapdata_p.h b/src/gui/image/qpixmapdata_p.h index 1a1c5aa03..0af24fab7 100644 --- a/src/gui/image/qpixmapdata_p.h +++ b/src/gui/image/qpixmapdata_p.h @@ -54,8 +54,6 @@ public: QPixmapData(int w, int h, PixelType type); ~QPixmapData(); - QPixmapData *createCompatiblePixmapData() const; - void fromImage(const QImage &image, Qt::ImageConversionFlags flags); void fromImageReader(QImageReader *imageReader, -- 2.11.0