replace QPixmapData::createCompatiblePixmapData() with its body

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 683051d..4d57846 100644 (file)
--- 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 6652c73..aa8e0f0 100644 (file)
--- 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 1a1c5aa..0af24fa 100644 (file)
--- 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,