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,8 +33,10 @@
 #include <objc/message.h>
 #import <Cocoa/Cocoa.h>
 
-QPixmap pixmapForExtension(const QString &ext, const QSize &size)
+namespace MacUtils
 {
+    QPixmap pixmapForExtension(const QString &ext, const QSize &size)
+    {
         @autoreleasepool {
             NSImage *image = [[NSWorkspace sharedWorkspace] iconForFileType:ext.toNSString()];
             if (image) {
@@ -45,10 +47,10 @@ QPixmap pixmapForExtension(const QString &ext, const QSize &size)
 
             return QPixmap();
         }
-}
+    }
 
-void overrideDockClickHandler(bool (*dockClickHandler)(id, SEL, ...))
+    void overrideDockClickHandler(bool (*dockClickHandler)(id, SEL, ...))
-{
+    {
         NSApplication *appInst = [NSApplication sharedApplication];
 
         if (!appInst)
@@ -69,10 +71,10 @@ void overrideDockClickHandler(bool (*dockClickHandler)(id, SEL, ...))
             else
                 qWarning("Failed to register dock click handler");
         }
-}
+    }
 
-void displayNotification(const QString &title, const QString &message)
+    void displayNotification(const QString &title, const QString &message)
-{
+    {
         @autoreleasepool {
             NSUserNotification *notification = [[NSUserNotification alloc] init];
             notification.title = title.toNSString();
@@ -81,10 +83,10 @@ void displayNotification(const QString &title, const QString &message)
 
             [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:notification];
         }
-}
+    }
 
-void openFiles(const QSet<QString> &pathsList)
+    void openFiles(const QSet<QString> &pathsList)
-{
+    {
         @autoreleasepool {
             NSMutableArray *pathURLs = [NSMutableArray arrayWithCapacity:pathsList.size()];
 
@@ -93,4 +95,5 @@ void openFiles(const QSet<QString> &pathsList)
 
             [[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);