1 files changed, 47 insertions, 14 deletions

diff --git a/src/gui/itemviews/qfileiconprovider.cpp b/src/gui/itemviews/qfileiconprovider.cpp
index f9078b8..b9df4fc 100644
--- a/src/gui/itemviews/qfileiconprovider.cpp
+++ b/src/gui/itemviews/qfileiconprovider.cpp
@@ -45,18 +45,17 @@
 #include <qstyle.h>
 #include <qapplication.h>
 #include <qdir.h>
+#include <qpixmapcache.h>
 #if defined(Q_WS_WIN)
 #define _WIN32_IE 0x0500
+#include <qt_windows.h>
+#include <commctrl.h>
 #include <objbase.h>
 #include <private/qpixmapdata_p.h>
-#include <qpixmapcache.h>
 #elif defined(Q_WS_MAC)
-#include <private/qt_mac_p.h>
+#include <private/qt_cocoa_helpers_mac_p.h>
 #endif
 #include <private/qfunctions_p.h>
-#ifdef Q_OS_WINCE
-#include <Commctrl.h>
-#endif
 
 #ifndef SHGFI_ADDOVERLAYS
 #define SHGFI_ADDOVERLAYS 0x000000020
@@ -242,10 +241,10 @@ QIcon QFileIconProviderPrivate::getWinIcon(const QFileInfo &fileInfo) const
 
     //Get the small icon
 #ifndef Q_OS_WINCE
-    val = SHGetFileInfo((const WCHAR *)QDir::toNativeSeparators(fileInfo.filePath()).utf16(), 0, &info,
+    val = SHGetFileInfo((const wchar_t *)QDir::toNativeSeparators(fileInfo.filePath()).utf16(), 0, &info,
                         sizeof(SHFILEINFO), SHGFI_ICON|SHGFI_SMALLICON|SHGFI_SYSICONINDEX|SHGFI_ADDOVERLAYS);
 #else
-    val = SHGetFileInfo((const WCHAR *)QDir::toNativeSeparators(fileInfo.filePath()).utf16(), 0, &info,
+    val = SHGetFileInfo((const wchar_t *)QDir::toNativeSeparators(fileInfo.filePath()).utf16(), 0, &info,
                         sizeof(SHFILEINFO), SHGFI_SMALLICON|SHGFI_SYSICONINDEX);
 #endif
     if (val) {
@@ -281,10 +280,10 @@ QIcon QFileIconProviderPrivate::getWinIcon(const QFileInfo &fileInfo) const
 
     //Get the big icon
 #ifndef Q_OS_WINCE
-    val = SHGetFileInfo((const WCHAR *)QDir::toNativeSeparators(fileInfo.filePath()).utf16(), 0, &info,
+    val = SHGetFileInfo((const wchar_t *)QDir::toNativeSeparators(fileInfo.filePath()).utf16(), 0, &info,
                         sizeof(SHFILEINFO), SHGFI_ICON|SHGFI_LARGEICON|SHGFI_SYSICONINDEX|SHGFI_ADDOVERLAYS);
 #else
-    val = SHGetFileInfo((const WCHAR *)QDir::toNativeSeparators(fileInfo.filePath()).utf16(), 0, &info,
+    val = SHGetFileInfo((const wchar_t *)QDir::toNativeSeparators(fileInfo.filePath()).utf16(), 0, &info,
                         sizeof(SHFILEINFO), SHGFI_LARGEICON|SHGFI_SYSICONINDEX);
 #endif
     if (val) {
@@ -314,6 +313,31 @@ QIcon QFileIconProviderPrivate::getWinIcon(const QFileInfo &fileInfo) const
 QIcon QFileIconProviderPrivate::getMacIcon(const QFileInfo &fi) const
 {
     QIcon retIcon;
+    QString fileExtension = fi.suffix().toUpper();
+    fileExtension.prepend(QLatin1String("."));
+
+    const QString keyBase = QLatin1String("qt_") + fileExtension;
+
+    QPixmap pixmap;
+    if (fi.isFile() && !fi.isExecutable() && !fi.isSymLink()) {
+        QPixmapCache::find(keyBase + QLatin1String("16"), pixmap);
+    }
+
+    if (!pixmap.isNull()) {
+        retIcon.addPixmap(pixmap);
+        if (QPixmapCache::find(keyBase + QLatin1String("32"), pixmap)) {
+            retIcon.addPixmap(pixmap);
+            if (QPixmapCache::find(keyBase + QLatin1String("64"), pixmap)) {
+                retIcon.addPixmap(pixmap);
+                if (QPixmapCache::find(keyBase + QLatin1String("128"), pixmap)) {
+                    retIcon.addPixmap(pixmap);
+                    return retIcon;
+                }
+            }
+        }
+    }
+
+
     FSRef macRef;
     OSStatus status = FSPathMakeRef(reinterpret_cast<const UInt8*>(fi.canonicalFilePath().toUtf8().constData()),
                                     &macRef, 0);
@@ -326,12 +350,23 @@ QIcon QFileIconProviderPrivate::getMacIcon(const QFileInfo &fi) const
         return retIcon;
     IconRef iconRef;
     SInt16 iconLabel;
-    status = GetIconRefFromFileInfo(&macRef, macName.length, macName.unicode, kIconServicesCatalogInfoMask, &info, kIconServicesNormalUsageFlag, &iconRef, &iconLabel);
+    status = GetIconRefFromFileInfo(&macRef, macName.length, macName.unicode,
+                                    kIconServicesCatalogInfoMask, &info, kIconServicesNormalUsageFlag,
+                                    &iconRef, &iconLabel);
     if (status != noErr)
         return retIcon;
-    extern void qt_mac_constructQIconFromIconRef(const IconRef, const IconRef, QIcon*, QStyle::StandardPixmap = QStyle::SP_CustomBase); // qmacstyle_mac.cpp
     qt_mac_constructQIconFromIconRef(iconRef, 0, &retIcon);
     ReleaseIconRef(iconRef);
+
+    pixmap = retIcon.pixmap(16);
+    QPixmapCache::insert(keyBase + QLatin1String("16"), pixmap);
+    pixmap = retIcon.pixmap(32);
+    QPixmapCache::insert(keyBase + QLatin1String("32"), pixmap);
+    pixmap = retIcon.pixmap(64);
+    QPixmapCache::insert(keyBase + QLatin1String("64"), pixmap);
+    pixmap = retIcon.pixmap(128);
+    QPixmapCache::insert(keyBase + QLatin1String("128"), pixmap);
+
     return retIcon;
 }
 #endif
@@ -356,9 +391,7 @@ QIcon QFileIconProvider::icon(const QFileInfo &info) const
     if (info.isRoot())
 #if defined (Q_WS_WIN) && !defined(Q_WS_WINCE)
     {
-        uint type = DRIVE_UNKNOWN;
-        QT_WA({ type = GetDriveTypeW((wchar_t *)info.absoluteFilePath().utf16()); },
-        { type = GetDriveTypeA(info.absoluteFilePath().toLocal8Bit()); });
+        UINT type = GetDriveType((wchar_t *)info.absoluteFilePath().utf16());
 
         switch (type) {
         case DRIVE_REMOVABLE: