diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 16:20:12 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 16:20:39 +0100 |
| commit | d1775349e4ea619aa7b634bcd7161374107038a1 (patch) | |
| tree | 300c60723c49ec7601f6ac886f37805b5afa0a6a /vcl/osx/salnsmenu.mm | |
| parent | aa4d195143fec01fba5c0a0f41950f1cbddbc9bd (diff) | |
loplugin:nullptr (automatic rewrite; Mac-specific code)
Change-Id: I90a955eb3e485723bb81e7164edcf60f7b0e94c7
Diffstat (limited to 'vcl/osx/salnsmenu.mm')
| -rw-r--r-- | vcl/osx/salnsmenu.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/osx/salnsmenu.mm b/vcl/osx/salnsmenu.mm index 23aac611dd7f..6bbc683fc5ec 100644 --- a/vcl/osx/salnsmenu.mm +++ b/vcl/osx/salnsmenu.mm @@ -79,7 +79,7 @@ (void)aSender; SolarMutexGuard aGuard; - const AquaSalFrame* pFrame = mpMenuItem->mpParentMenu ? mpMenuItem->mpParentMenu->getFrame() : NULL; + const AquaSalFrame* pFrame = mpMenuItem->mpParentMenu ? mpMenuItem->mpParentMenu->getFrame() : nullptr; if( pFrame && AquaSalFrame::isAlive( pFrame ) && ! pFrame->GetWindow()->IsInModalMode() ) { SalMenuEvent aMenuEvt( mpMenuItem->mnId, mpMenuItem->mpVCLMenu ); @@ -193,7 +193,7 @@ { static_cast<CGFloat>(rButtons[i].maButton.maImage.GetSizePixel().Width()), static_cast<CGFloat>(rButtons[i].maButton.maImage.GetSizePixel().Height()) } }; if( rButtons[i].mpToolTipString ) - [self addToolTipRect: aImgRect owner: rButtons[i].mpToolTipString userData: NULL]; + [self addToolTipRect: aImgRect owner: rButtons[i].mpToolTipString userData: nullptr]; aSize.width += 2 + aImgRect.size.width; } } |