summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Slimber')
-rw-r--r--Slimber/Cocoa/CocoaMenulet.mm2
-rw-r--r--Slimber/Server.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/Slimber/Cocoa/CocoaMenulet.mm b/Slimber/Cocoa/CocoaMenulet.mm
index 98042d7..a05843e 100644
--- a/Slimber/Cocoa/CocoaMenulet.mm
+++ b/Slimber/Cocoa/CocoaMenulet.mm
@@ -44,7 +44,7 @@ void CocoaMenulet::clear() {
void CocoaMenulet::addItem(const std::string& name, const std::string& icon) {
NSMenuItem* item = [[NSMenuItem alloc] initWithTitle: std2NSString(name)
- action: NULL keyEquivalent: @""];
+ action: nullptr keyEquivalent: @""];
if (!icon.empty()) {
NSString* path = [[NSBundle mainBundle] pathForResource: std2NSString(icon) ofType:@"png"];
NSImage* image = [[NSImage alloc] initWithContentsOfFile: path];
diff --git a/Slimber/Server.cpp b/Slimber/Server.cpp
index c69c75d..d1afc23 100644
--- a/Slimber/Server.cpp
+++ b/Slimber/Server.cpp
@@ -51,7 +51,7 @@ Server::Server(
linkLocalServiceBrowser(linkLocalServiceBrowser),
vCardCollection(vCardCollection),
eventLoop(eventLoop),
- presenceManager(NULL),
+ presenceManager(nullptr),
stopping(false) {
linkLocalServiceBrowser->onServiceRegistered.connect(
boost::bind(&Server::handleServiceRegistered, this, _1));
@@ -105,7 +105,7 @@ void Server::stop(boost::optional<ServerError> e) {
stopping = true;
delete presenceManager;
- presenceManager = NULL;
+ presenceManager = nullptr;
if (serverFromClientSession) {
serverFromClientSession->finishSession();