diff options
author | Fabian Müller <fmueller@owncloud.com> | 2022-10-31 17:43:56 +0300 |
---|---|---|
committer | Fabian Müller <fmueller@owncloud.com> | 2022-10-31 17:43:56 +0300 |
commit | bc62b3ee480a6c8510275127486fdeca5bee538d (patch) | |
tree | 6a3c14d72c694b838a115993e0eb1e4a6477ed91 | |
parent | 865c875df9209e16efe7256ce9d6d7557ae85176 (diff) |
macOS...work-linux-platform
-rw-r--r-- | src/libsync/platform_mac.h | 6 | ||||
-rw-r--r-- | src/libsync/platform_mac.mm | 16 |
2 files changed, 16 insertions, 6 deletions
diff --git a/src/libsync/platform_mac.h b/src/libsync/platform_mac.h index bbfcd6d44..78fb2e537 100644 --- a/src/libsync/platform_mac.h +++ b/src/libsync/platform_mac.h @@ -17,8 +17,7 @@ #include "platform.h" #include <QProcess> - -#import <AppKit/NSApplication.h> +#include <qglobal.h> namespace OCC { @@ -34,8 +33,7 @@ public: void migrate() override; private: - QMacAutoReleasePool _autoReleasePool; - OwnAppDelegate *_appDelegate; + Q_DECLARE_PRIVATE(FolderWizard); }; } // namespace OCC diff --git a/src/libsync/platform_mac.mm b/src/libsync/platform_mac.mm index f6a301186..fcb425d37 100644 --- a/src/libsync/platform_mac.mm +++ b/src/libsync/platform_mac.mm @@ -16,6 +16,8 @@ #include "platform_mac.h" #include "application.h" +#import <AppKit/NSApplication.h> + @interface OwnAppDelegate : NSObject <NSApplicationDelegate> - (BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)flag; @end @@ -34,10 +36,19 @@ namespace OCC { +class MacPlatformPrivate +{ +public: + QMacAutoReleasePool _autoReleasePool; + OwnAppDelegate *_appDelegate; +}; + MacPlatform::MacPlatform() { + Q_D(MacPlatform); + NSApplicationLoad(); - _appDelegate = [[OwnAppDelegate alloc] init]; + d->_appDelegate = [[OwnAppDelegate alloc] init]; [[NSApplication sharedApplication] setDelegate:_appDelegate]; signal(SIGPIPE, SIG_IGN); @@ -45,7 +56,8 @@ MacPlatform::MacPlatform() MacPlatform::~MacPlatform() { - [_appDelegate release]; + Q_D(MacPlatform); + [d->_appDelegate release]; } void MacPlatform::migrate() |