diff options
Diffstat (limited to 'Slimber/Cocoa')
-rw-r--r-- | Slimber/Cocoa/CocoaController.h | 6 | ||||
-rw-r--r-- | Slimber/Cocoa/CocoaController.mm | 14 | ||||
-rw-r--r-- | Slimber/Cocoa/CocoaMenulet.h | 8 |
3 files changed, 16 insertions, 12 deletions
diff --git a/Slimber/Cocoa/CocoaController.h b/Slimber/Cocoa/CocoaController.h index 8f42fbf..f6881ae 100644 --- a/Slimber/Cocoa/CocoaController.h +++ b/Slimber/Cocoa/CocoaController.h @@ -1,11 +1,11 @@ /* - * Copyright (c) 2010-2012 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ -// Fix Boost-Cocoa conflict -#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0 +#pragma once + #include <Cocoa/Cocoa.h> class MainController; diff --git a/Slimber/Cocoa/CocoaController.mm b/Slimber/Cocoa/CocoaController.mm index 2ee350d..da1df98 100644 --- a/Slimber/Cocoa/CocoaController.mm +++ b/Slimber/Cocoa/CocoaController.mm @@ -1,8 +1,14 @@ -#include "Slimber/Cocoa/CocoaController.h" +/* + * Copyright (c) 2015 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ -#include "Slimber/MainController.h" -#include "Slimber/Cocoa/CocoaMenulet.h" -#include "Slimber/Cocoa/main.h" +#include <Slimber/Cocoa/CocoaController.h> + +#include <Slimber/MainController.h> +#include <Slimber/Cocoa/CocoaMenulet.h> +#include <Slimber/Cocoa/main.h> @implementation CocoaController { CocoaMenulet* menulet; diff --git a/Slimber/Cocoa/CocoaMenulet.h b/Slimber/Cocoa/CocoaMenulet.h index fa4848e..887fdf9 100644 --- a/Slimber/Cocoa/CocoaMenulet.h +++ b/Slimber/Cocoa/CocoaMenulet.h @@ -1,22 +1,20 @@ /* - * Copyright (c) 2010-2012 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -// Fix Boost-Cocoa conflict -#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0 #include <Cocoa/Cocoa.h> +#include <Slimber/Menulet.h> -#include "Slimber/Menulet.h" #include <SwifTools/Cocoa/CocoaAction.h> class CocoaMenulet : public Menulet { public: CocoaMenulet(); - ~CocoaMenulet(); + virtual ~CocoaMenulet(); private: virtual void clear(); |