From 0b924cdaeec3cc5a597b0eef2b62592b521dfde7 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Mon, 31 Oct 2011 14:58:56 +0100 Subject: Remove declaration of QRasterPlatformPixmap::fromFile() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This function is not implemented, and the declaration hides the virtual QPlatformPixtmap::fromFile(): ../../include/QtGui/5.0.0/QtGui/private/../../../../../src/gui/image/qpixmap_raster_p.h:70:10: warning: 'QRasterPlatformPixmap::fromFile' hides overloaded virtual function [-Woverloaded-virtual] void fromFile(const QString &filename, Qt::ImageConversionFlags flags); ^ ../../include/QtGui/../../src/gui/image/qplatformpixmap_qpa.h:90:18: note: hidden overloaded virtual function 'QPlatformPixmap::fromFile' declared here virtual bool fromFile(const QString &filename, const char *format, ^ Change-Id: Iedbc4acd9f9218f8fe72a44a9eff6a35b5494d75 Reviewed-by: Samuel Rødal --- src/gui/image/qpixmap_raster_p.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/gui/image') diff --git a/src/gui/image/qpixmap_raster_p.h b/src/gui/image/qpixmap_raster_p.h index 0de212dd61..91ed4cfdc5 100644 --- a/src/gui/image/qpixmap_raster_p.h +++ b/src/gui/image/qpixmap_raster_p.h @@ -67,7 +67,6 @@ public: QPlatformPixmap *createCompatiblePlatformPixmap() const; void resize(int width, int height); - void fromFile(const QString &filename, Qt::ImageConversionFlags flags); bool fromData(const uchar *buffer, uint len, const char *format, Qt::ImageConversionFlags flags); void fromImage(const QImage &image, Qt::ImageConversionFlags flags); void fromImageReader(QImageReader *imageReader, Qt::ImageConversionFlags flags); -- cgit v1.2.3