misc cleanups

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

diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index dff74b5..ef1dd3a 100644 (file)
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -122,11 +122,6 @@ static bool qt_pixmap_thread_test()
     return true;
 }
 
-void QPixmap::init(int w, int h, Type type)
-{
-    init(w, h, int(type));
-}
-
 extern QApplication::Type qt_appType;
 
 void QPixmap::init(int w, int h, int type)
@@ -217,17 +212,6 @@ QPixmap::QPixmap(const QSize &size)
 /*!
   \internal
 */
-QPixmap::QPixmap(const QSize &s, Type type)
-{
-    if (!qt_pixmap_thread_test())
-        init(0, 0, type);
-    else
-        init(s.width(), s.height(), type);
-}
-
-/*!
-  \internal
-*/
 QPixmap::QPixmap(const QSize &s, int type)
 {
     if (!qt_pixmap_thread_test())

diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index 6674796..9592853 100644 (file)
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -212,11 +212,6 @@ private:
 
     bool doImageIO(QImageWriter *io, int quality) const;
 
-    // ### Qt5: remove the following three lines
-    enum Type { PixmapType, BitmapType }; // must match QPixmapData::PixelType
-    QPixmap(const QSize &s, Type);
-    void init(int, int, Type = PixmapType);
-
     QPixmap(const QSize &s, int type);
     void init(int, int, int);
     void deref();