summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'SwifTools/Dock/MacOSXDock.mm')
-rw-r--r--SwifTools/Dock/MacOSXDock.mm22
1 files changed, 13 insertions, 9 deletions
diff --git a/SwifTools/Dock/MacOSXDock.mm b/SwifTools/Dock/MacOSXDock.mm
index 3164998..3935ac0 100644
--- a/SwifTools/Dock/MacOSXDock.mm
+++ b/SwifTools/Dock/MacOSXDock.mm
@@ -1,11 +1,15 @@
-// Fix Boost-Cocoa conflict
-#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
+/*
+ * Copyright (c) 2015-2018 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
#include <SwifTools/Dock/MacOSXDock.h>
+#include <boost/lexical_cast.hpp>
+
#include <AppKit/AppKit.h>
#include <Cocoa/Cocoa.h>
-#include <boost/lexical_cast.hpp>
#include <Swiften/Base/String.h>
@@ -14,12 +18,12 @@ namespace Swift {
MacOSXDock::MacOSXDock(CocoaApplication*) {
}
-void MacOSXDock::setNumberOfPendingMessages(int i) {
- std::string label(i > 0 ? boost::lexical_cast<std::string>(i) : "");
- NSString *labelString = [[NSString alloc] initWithUTF8String: label.c_str()];
- [[NSApp dockTile] setBadgeLabel: labelString];
- [labelString release];
- [NSApp requestUserAttention: NSInformationalRequest];
+void MacOSXDock::setNumberOfPendingMessages(size_t i) {
+ std::string label(i > 0 ? boost::lexical_cast<std::string>(i) : "");
+ NSString *labelString = [[NSString alloc] initWithUTF8String: label.c_str()];
+ [[NSApp dockTile] setBadgeLabel: labelString];
+ [labelString release];
+ [NSApp requestUserAttention: NSInformationalRequest];
}
}