Put macOS specific functions to MacUtils namespace

src/gui/macutilities.h

@@ -33,9 +33,12 @@
 #include <QSize>
 #include <objc/objc.h>
 
-QPixmap pixmapForExtension(const QString &ext, const QSize &size);
+namespace MacUtils
-void overrideDockClickHandler(bool (*dockClickHandler)(id, SEL, ...));
+{
-void displayNotification(const QString &title, const QString &message);
+    QPixmap pixmapForExtension(const QString &ext, const QSize &size);
-void openFiles(const QSet<QString> &pathsList);
+    void overrideDockClickHandler(bool (*dockClickHandler)(id, SEL, ...));
+    void displayNotification(const QString &title, const QString &message);
+    void openFiles(const QSet<QString> &pathsList);
+}
 
 #endif // MACUTILITIES_H

src/gui/macutilities.mm

@@ -33,64 +33,67 @@
 #include <objc/message.h>
 #import <Cocoa/Cocoa.h>
 
-QPixmap pixmapForExtension(const QString &ext, const QSize &size)
+namespace MacUtils
 {
-    @autoreleasepool {
+    QPixmap pixmapForExtension(const QString &ext, const QSize &size)
-        NSImage *image = [[NSWorkspace sharedWorkspace] iconForFileType:ext.toNSString()];
+    {
-        if (image) {
+        @autoreleasepool {
-            NSRect rect = NSMakeRect(0, 0, size.width(), size.height());
+            NSImage *image = [[NSWorkspace sharedWorkspace] iconForFileType:ext.toNSString()];
-            CGImageRef cgImage = [image CGImageForProposedRect:&rect context:nil hints:nil];
+            if (image) {
-            return QtMac::fromCGImageRef(cgImage);
+                NSRect rect = NSMakeRect(0, 0, size.width(), size.height());
+                CGImageRef cgImage = [image CGImageForProposedRect:&rect context:nil hints:nil];
+                return QtMac::fromCGImageRef(cgImage);
+            }
+
+            return QPixmap();
         }
-        
-        return QPixmap();
     }
-}
 
-void overrideDockClickHandler(bool (*dockClickHandler)(id, SEL, ...))
+    void overrideDockClickHandler(bool (*dockClickHandler)(id, SEL, ...))
-{
+    {
-    NSApplication *appInst = [NSApplication sharedApplication];
+        NSApplication *appInst = [NSApplication sharedApplication];
-    
+
-    if (!appInst)
+        if (!appInst)
-        return;
+            return;
-    
+
-    Class delClass = [[appInst delegate] class];
+        Class delClass = [[appInst delegate] class];
-    SEL shouldHandle = sel_registerName("applicationShouldHandleReopen:hasVisibleWindows:");
+        SEL shouldHandle = sel_registerName("applicationShouldHandleReopen:hasVisibleWindows:");
-    
+
-    if (class_getInstanceMethod(delClass, shouldHandle)) {
+        if (class_getInstanceMethod(delClass, shouldHandle)) {
-        if (class_replaceMethod(delClass, shouldHandle, (IMP)dockClickHandler, "B@:"))
+            if (class_replaceMethod(delClass, shouldHandle, (IMP)dockClickHandler, "B@:"))
-            qDebug("Registered dock click handler (replaced original method)");
+                qDebug("Registered dock click handler (replaced original method)");
-        else
+            else
-            qWarning("Failed to replace method for dock click handler");
+                qWarning("Failed to replace method for dock click handler");
-    }
+        }
-    else {
+        else {
-        if (class_addMethod(delClass, shouldHandle, (IMP)dockClickHandler, "B@:"))
+            if (class_addMethod(delClass, shouldHandle, (IMP)dockClickHandler, "B@:"))
-            qDebug("Registered dock click handler");
+                qDebug("Registered dock click handler");
-        else
+            else
-            qWarning("Failed to register dock click handler");
+                qWarning("Failed to register dock click handler");
+        }
     }
-}
 
-void displayNotification(const QString &title, const QString &message)
+    void displayNotification(const QString &title, const QString &message)
-{
+    {
-    @autoreleasepool {
+        @autoreleasepool {
-        NSUserNotification *notification = [[NSUserNotification alloc] init];
+            NSUserNotification *notification = [[NSUserNotification alloc] init];
-        notification.title = title.toNSString();
+            notification.title = title.toNSString();
-        notification.informativeText = message.toNSString();
+            notification.informativeText = message.toNSString();
-        notification.soundName = NSUserNotificationDefaultSoundName;
+            notification.soundName = NSUserNotificationDefaultSoundName;
 
-        [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:notification];
+            [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:notification];
+        }
     }
-}
 
-void openFiles(const QSet<QString> &pathsList)
+    void openFiles(const QSet<QString> &pathsList)
-{
+    {
-    @autoreleasepool {
+        @autoreleasepool {
-        NSMutableArray *pathURLs = [NSMutableArray arrayWithCapacity:pathsList.size()];
+            NSMutableArray *pathURLs = [NSMutableArray arrayWithCapacity:pathsList.size()];
 
-        for (const auto &path : pathsList)
+            for (const auto &path : pathsList)
-            [pathURLs addObject:[NSURL fileURLWithPath:path.toNSString()]];
+                [pathURLs addObject:[NSURL fileURLWithPath:path.toNSString()]];
 
-        [[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs:pathURLs];
+            [[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs:pathURLs];
+        }
     }
 }

src/gui/mainwindow.cpp

@@ -1298,7 +1298,7 @@ static bool dockClickHandler(id self, SEL cmd, ...)
 void MainWindow::setupDockClickHandler()
 {
     dockMainWindowHandle = this;
-    overrideDockClickHandler(dockClickHandler);
+    MacUtils::overrideDockClickHandler(dockClickHandler);
 }
 
 #endif
@@ -1557,7 +1557,7 @@ void MainWindow::showNotificationBaloon(QString title, QString msg) const
     if (!reply.isError())
         return;
 #elif defined(Q_OS_MAC)
-    displayNotification(title, msg);
+    MacUtils::displayNotification(title, msg);
 #else
     if (m_systrayIcon && QSystemTrayIcon::supportsMessages())
         m_systrayIcon->showMessage(title, msg, QSystemTrayIcon::Information, TIME_TRAY_BALLOON);

src/gui/torrentcontentmodel.cpp

@@ -150,7 +150,7 @@ namespace
     {
         QPixmap pixmapForExtension(const QString &ext) const override
         {
-            return ::pixmapForExtension(ext, QSize(32, 32));
+            return MacUtils::pixmapForExtension(ext, QSize(32, 32));
         }
     };
 #else

src/gui/transferlistwidget.cpp

@@ -559,7 +559,7 @@ void TransferListWidget::openSelectedTorrentsFolder() const
         QString path = torrent->contentPath(true);
         pathsList.insert(path);
     }
-    openFiles(pathsList);
+    MacUtils::openFiles(pathsList);
 #else
     foreach (BitTorrent::TorrentHandle *const torrent, getSelectedTorrents()) {
         QString path = torrent->contentPath(true);