OSDN Git Service

FileIconProvider calling itself instead of a second object.
authorRobert Loehning <robert.loehning@nokia.com>
Wed, 9 Jun 2010 10:58:16 +0000 (12:58 +0200)
committerRobert Loehning <robert.loehning@nokia.com>
Wed, 9 Jun 2010 10:58:16 +0000 (12:58 +0200)
Reviewed-by: Friedemann Kleint
src/plugins/coreplugin/fileiconprovider.cpp

index db06060..b2a39c0 100644 (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);
 }
 
 /*!