summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-04-01 12:36:16 (GMT)
committerTobias Markmann <tm@ayena.de>2016-04-01 15:56:34 (GMT)
commiteddd92ed76ae68cb1e202602fd3ebd11b69191a2 (patch)
tree8d396e5801d77a2f0ee4ab8e4c5093d8cf8118e6 /Slimber/Cocoa
parenta79db8d446e152b715f435550c2a6e10a36ee532 (diff)
downloadswift-eddd92ed76ae68cb1e202602fd3ebd11b69191a2.zip
swift-eddd92ed76ae68cb1e202602fd3ebd11b69191a2.tar.bz2
Modernize code to use C++11 nullptr using clang-tidy
Run 'clang-tidy -fix -checks=modernize-use-nullptr' on all source code files on OS X. This does not modernize platform specific code on Linux and Windows Test-Information: Code builds and unit tests pass on OS X 10.11.4. Change-Id: Ic43ffeb1b76c1a933a55af03db3c54977f5f60dd
Diffstat (limited to 'Slimber/Cocoa')
-rw-r--r--Slimber/Cocoa/CocoaMenulet.mm2
1 files changed, 1 insertions, 1 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];