diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index c7306ad6a2..c2b9c6a1b9 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -92,7 +92,7 @@ static bool qt_pixmap_thread_test() return true; } -void QPixmap::init(int w, int h, int type) +void QPixmap::doInit(int w, int h, int type) { if ((w > 0 && h > 0) || type == QPlatformPixmap::BitmapType) data = QPlatformPixmap::create(w, h, (QPlatformPixmap::PixelType) type); @@ -126,7 +126,7 @@ QPixmap::QPixmap() : QPaintDevice() { (void) qt_pixmap_thread_test(); - init(0, 0, QPlatformPixmap::PixmapType); + doInit(0, 0, QPlatformPixmap::PixmapType); } /*! @@ -147,9 +147,9 @@ QPixmap::QPixmap(int w, int h) : QPaintDevice() { if (!qt_pixmap_thread_test()) - init(0, 0, QPlatformPixmap::PixmapType); + doInit(0, 0, QPlatformPixmap::PixmapType); else - init(w, h, QPlatformPixmap::PixmapType); + doInit(w, h, QPlatformPixmap::PixmapType); } /*! @@ -166,9 +166,9 @@ QPixmap::QPixmap(const QSize &size) : QPaintDevice() { if (!qt_pixmap_thread_test()) - init(0, 0, QPlatformPixmap::PixmapType); + doInit(0, 0, QPlatformPixmap::PixmapType); else - init(size.width(), size.height(), QPlatformPixmap::PixmapType); + doInit(size.width(), size.height(), QPlatformPixmap::PixmapType); } /*! @@ -177,9 +177,9 @@ QPixmap::QPixmap(const QSize &size) QPixmap::QPixmap(const QSize &s, int type) { if (!qt_pixmap_thread_test()) - init(0, 0, static_cast(type)); + doInit(0, 0, static_cast(type)); else - init(s.width(), s.height(), static_cast(type)); + doInit(s.width(), s.height(), static_cast(type)); } /*! @@ -222,7 +222,7 @@ QPixmap::QPixmap(QPlatformPixmap *d) QPixmap::QPixmap(const QString& fileName, const char *format, Qt::ImageConversionFlags flags) : QPaintDevice() { - init(0, 0, QPlatformPixmap::PixmapType); + doInit(0, 0, QPlatformPixmap::PixmapType); if (!qt_pixmap_thread_test()) return; @@ -239,7 +239,7 @@ QPixmap::QPixmap(const QPixmap &pixmap) : QPaintDevice() { if (!qt_pixmap_thread_test()) { - init(0, 0, QPlatformPixmap::PixmapType); + doInit(0, 0, QPlatformPixmap::PixmapType); return; } if (pixmap.paintingActive()) { // make a deep copy @@ -268,7 +268,7 @@ QPixmap::QPixmap(const QPixmap &pixmap) QPixmap::QPixmap(const char * const xpm[]) : QPaintDevice() { - init(0, 0, QPlatformPixmap::PixmapType); + doInit(0, 0, QPlatformPixmap::PixmapType); if (!xpm) return; diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index 330370e25b..5d300d1f76 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -175,7 +175,7 @@ private: bool doImageIO(QImageWriter *io, int quality) const; QPixmap(const QSize &s, int type); - void init(int, int, int); + void doInit(int, int, int); void deref(); Q_DUMMY_COMPARISON_OPERATOR(QPixmap) friend class QPlatformPixmap;