Cleaned up calls to parent class's functions

diff --git a/src/plugins/coreplugin/fileiconprovider.cpp b/src/plugins/coreplugin/fileiconprovider.cpp
index b2a39c0..8f2d508 100644 (file)
--- a/src/plugins/coreplugin/fileiconprovider.cpp
+++ b/src/plugins/coreplugin/fileiconprovider.cpp
@@ -148,16 +148,6 @@ QIcon FileIconProvider::icon(const QFileInfo &fileInfo) const
 #endif
 }
 
-QIcon FileIconProvider::icon(IconType type) const
-{
-    return QFileIconProvider::icon(type);
-}
-
-QString FileIconProvider::type(const QFileInfo &info) const
-{
-    return QFileIconProvider::type(info);
-}
-
 /*!
   Creates a pixmap with baseicon at size and overlays overlayIcon over it.
   See platform note in class documentation about recommended usage.

diff --git a/src/plugins/coreplugin/fileiconprovider.h b/src/plugins/coreplugin/fileiconprovider.h
index 31fef66..b834459 100644 (file)
--- a/src/plugins/coreplugin/fileiconprovider.h
+++ b/src/plugins/coreplugin/fileiconprovider.h
@@ -56,9 +56,8 @@ public:
     virtual ~FileIconProvider();
 
     // Implement QFileIconProvider
-    virtual QIcon icon(IconType type) const;
     virtual QIcon icon(const QFileInfo &info) const;
-    virtual QString type(const QFileInfo &info) const;
+    using QFileIconProvider::icon;
 
     // Register additional overlay icons
     static QPixmap overlayIcon(QStyle::StandardPixmap baseIcon, const QIcon &overlayIcon, const QSize &size);