From: Bradley T. Hughes <bradley.hughes@nokia.com>
Date: Mon, 31 Oct 2011 13:58:56 +0000 (+0100)
Subject: Remove declaration of QRasterPlatformPixmap::fromFile()
X-Git-Tag: qt-v5.0.0-alpha1~2961
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0b924cdaeec3cc5a597b0eef2b62592b521dfde7;p=profile%2Fivi%2Fqtbase.git

Remove declaration of QRasterPlatformPixmap::fromFile()

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 <samuel.rodal@nokia.com>
---

diff --git a/src/gui/image/qpixmap_raster_p.h b/src/gui/image/qpixmap_raster_p.h
index 0de212d..91ed4cf 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);