4 files changed, 21 insertions, 14 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,16 +1,16 @@
 /*
- * 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;
 class CocoaMenulet;
 
 @interface CocoaController : NSObject
 
 @end
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,14 +1,20 @@
-#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;
 	MainController* main;
 }
 
 - (void) dealloc {
 	delete main;
 	delete 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,28 +1,26 @@
 /*
- * 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();
 		virtual void addItem(const std::string& name, const std::string& icon);
 		virtual void addSeparator();
 		void setIcon(const std::string& icon);
 		virtual void addAboutItem();
 		virtual void addRestartItem();
 		virtual void addExitItem();
diff --git a/SwifTools/Dock/MacOSXDock.mm b/SwifTools/Dock/MacOSXDock.mm
index 3164998..8c196d8 100644
--- a/SwifTools/Dock/MacOSXDock.mm
+++ b/SwifTools/Dock/MacOSXDock.mm
@@ -1,11 +1,14 @@
-// Fix Boost-Cocoa conflict
-#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
 
 #include <SwifTools/Dock/MacOSXDock.h>
 
 #include <AppKit/AppKit.h>
 #include <Cocoa/Cocoa.h>
 #include <boost/lexical_cast.hpp>
 
 #include <Swiften/Base/String.h>