Migrate away from deprecated iconForFileType

Ryu481 · web-flow · commit 03efbac58176 · 2025-07-21T01:47:26.000+08:00
Currently `iconForFileType` is used on macOS to display the file icons in the content tab. However this is marked as deprecated and should be replaced with `iconForContentType`. Related #15630. PR #22992.
diff --git a/src/gui/macutilities.mm b/src/gui/macutilities.mm
@@ -29,6 +29,7 @@
 #include "macutilities.h"
 
 #import <Cocoa/Cocoa.h>
+#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
 #include <objc/message.h>
 
 #include <QPixmap>
@@ -45,7 +46,8 @@ QPixmap pixmapForExtension(const QString &ext, const QSize &size)
     {
         @autoreleasepool
         {
-            NSImage *image = [[NSWorkspace sharedWorkspace] iconForFileType:ext.toNSString()];
+            const NSImage *image = [[NSWorkspace sharedWorkspace]
+                iconForContentType:[UTType typeWithFilenameExtension:ext.toNSString()]];
             if (image)
             {
                 NSRect rect = NSMakeRect(0, 0, size.width(), size.height());

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`#include "macutilities.h"`
`30`	`30`
`31`	`31`	`#import <Cocoa/Cocoa.h>`
	`32`	`+#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>`
`32`	`33`	`#include <objc/message.h>`
`33`	`34`
`34`	`35`	`#include <QPixmap>`
`@@ -45,7 +46,8 @@ QPixmap pixmapForExtension(const QString &ext, const QSize &size)`
`45`	`46`	`{`
`46`	`47`	`@autoreleasepool`
`47`	`48`	`{`
`48`		`- NSImage *image = [[NSWorkspace sharedWorkspace] iconForFileType:ext.toNSString()];`
	`49`	`+ const NSImage *image = [[NSWorkspace sharedWorkspace]`
	`50`	`+ iconForContentType:[UTType typeWithFilenameExtension:ext.toNSString()]];`
`49`	`51`	`if (image)`
`50`	`52`	`{`
`51`	`53`	`NSRect rect = NSMakeRect(0, 0, size.width(), size.height());`