dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix macos build

Browse Source
This commit is contained in:
Jonas Kvinge
2019-01-02 00:32:36 +01:00
parent 45c4be3ae9
commit d398018633
9 changed files with 65 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/globalshortcuts/globalshortcutbackend-macos.h
View File

@@ -36,7 +36,7 @@
class GlobalShortcut;
class GlobalShortcutBackendPrivateMacOS;
class GlobalShortcutBackendMacOSPrivate;
class GlobalShortcutBackendMacOS : public GlobalShortcutBackend {
Q_OBJECT
@@ -59,8 +59,8 @@ class GlobalShortcutBackendMacOS : public GlobalShortcutBackend {
QMap<QKeySequence, QAction*> shortcuts_;
friend class GlobalShortcutBackendPrivateMacOS;
std::unique_ptr<GlobalShortcutBackendPrivateMacOS> p_;
friend class GlobalShortcutBackendMacOSPrivate;
std::unique_ptr<GlobalShortcutBackendMacOSPrivate> p_;
};
#endif // GLOBALSHORTCUTBACKEND_MACOS_H

6
src/globalshortcuts/globalshortcutbackend-macos.mm
View File

@@ -44,9 +44,9 @@
#import "core/mac_utilities.h"
#import "core/SBSystemPreferences.h"
class GlobalShortcutBackendPrivate_MacOS : boost::noncopyable {
class GlobalShortcutBackendMacOSPrivate : boost::noncopyable {
public:
explicit GlobalShortcutBackendPrivate_MacOS(GlobalShortcutBackendMacOS* backend)
explicit GlobalShortcutBackendMacOSPrivate(GlobalShortcutBackendMacOS* backend)
: global_monitor_(nil), local_monitor_(nil), backend_(backend) {}
bool Register() {
@@ -80,7 +80,7 @@ class GlobalShortcutBackendPrivate_MacOS : boost::noncopyable {
GlobalShortcutBackendMacOS::GlobalShortcutBackendMacOS(GlobalShortcuts* parent)
: GlobalShortcutBackend(parent),
p_(new GlobalShortcutBackendPrivate_MacOS(this)) {}
p_(new GlobalShortcutBackendMacOSPrivate(this)) {}
GlobalShortcutBackendMacOS::~GlobalShortcutBackendMacOS() {}