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

FileIconProvider calling itself instead of a second object.

Browse Source 
Reviewed-by: Friedemann Kleint
This commit is contained in:
Robert Loehning
2010-06-09 12:58:16 +02:00
parent 1dc99e8ff3
commit 101f4d3f65
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,7 +90,6 @@ struct FileIconProviderPrivate {
// Mapping of file suffix to icon.
StringIconPairList m_cache;
QFileIconProvider m_systemIconProvider;
QIcon m_unknownFileIcon;
// singleton pattern
@@ -140,23 +139,23 @@ QIcon FileIconProvider::icon(const QFileInfo &fileInfo) const
}
// Get icon from OS.
#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
return d->m_systemIconProvider.icon(fileInfo);
return QFileIconProvider::icon(fileInfo);
#else
// File icons are unknown on linux systems.
return (fileInfo.isDir()) ?
d->m_systemIconProvider.icon(fileInfo) :
QFileIconProvider::icon(fileInfo) :
d->m_unknownFileIcon;
#endif
}
QIcon FileIconProvider::icon(IconType type) const
{
return d->m_systemIconProvider.icon(type);
return QFileIconProvider::icon(type);
}
QString FileIconProvider::type(const QFileInfo &info) const
{
return d->m_systemIconProvider.type(info);
return QFileIconProvider::type(info);
}
/*!