feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Cleaned up calls to parent class's functions

Browse Source
This commit is contained in:
Robert Loehning
2010-06-09 16:53:56 +02:00
parent 740717f060
commit 6056c3e126
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/coreplugin/fileiconprovider.cpp
View File

@@ -148,16 +148,6 @@ QIcon FileIconProvider::icon(const QFileInfo &fileInfo) const
#endif #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. Creates a pixmap with baseicon at size and overlays overlayIcon over it.
See platform note in class documentation about recommended usage. See platform note in class documentation about recommended usage.

3
src/plugins/coreplugin/fileiconprovider.h
View File

@@ -56,9 +56,8 @@ public:
virtual ~FileIconProvider(); virtual ~FileIconProvider();
// Implement QFileIconProvider // Implement QFileIconProvider
virtual QIcon icon(IconType type) const;
virtual QIcon icon(const QFileInfo &info) const; virtual QIcon icon(const QFileInfo &info) const;
virtual QString type(const QFileInfo &info) const; using QFileIconProvider::icon;
// Register additional overlay icons // Register additional overlay icons
static QPixmap overlayIcon(QStyle::StandardPixmap baseIcon, const QIcon &overlayIcon, const QSize &size); static QPixmap overlayIcon(QStyle::StandardPixmap baseIcon, const QIcon &overlayIcon, const QSize &size);