diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:11:10 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:18 +0100 |
| commit | c40c7a8c364bd8f1d7777e803e5a6b0cfddeaca3 (patch) | |
| tree | 8747fa725af32579c947951d4e739520b655842c /canvas/source/tools | |
| parent | 655c2d5193a8f04d8d0e34c18c8d887589f0e6a9 (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I9e064592c4ee18a600aadfa20b3c89ecafc818d4
Diffstat (limited to 'canvas/source/tools')
| -rw-r--r-- | canvas/source/tools/elapsedtime.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/tools/page.hxx | 6 | ||||
| -rw-r--r-- | canvas/source/tools/parametricpolypolygon.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/canvas/source/tools/elapsedtime.cxx b/canvas/source/tools/elapsedtime.cxx index 8922f5ca055d..d080c789a290 100644 --- a/canvas/source/tools/elapsedtime.cxx +++ b/canvas/source/tools/elapsedtime.cxx @@ -156,7 +156,7 @@ void ElapsedTime::adjustTimer( double fOffset, bool /*bLimitToLastQueriedTime*/ double ElapsedTime::getCurrentTime() const { - return m_pTimeBase.get() == 0 + return m_pTimeBase.get() == nullptr ? getSystemTime() : m_pTimeBase->getElapsedTimeImpl(); } diff --git a/canvas/source/tools/page.hxx b/canvas/source/tools/page.hxx index c456a2983570..f2c3ff054214 100644 --- a/canvas/source/tools/page.hxx +++ b/canvas/source/tools/page.hxx @@ -81,14 +81,14 @@ namespace canvas /// Creates a 'naked' fragment. explicit PageFragment( const ::basegfx::B2ISize& rSize ) : - mpPage(NULL), + mpPage(nullptr), maRect(rSize), mpBuffer(), maSourceOffset() { } - bool isNaked() const { return (mpPage == NULL); } + bool isNaked() const { return (mpPage == nullptr); } const SurfaceRect& getRect() const { return maRect; } const ::basegfx::B2IPoint& getPos() const { return maRect.maPos; } const ::basegfx::B2ISize& getSize() const { return maRect.maSize; } @@ -101,7 +101,7 @@ namespace canvas if(mpPage) mpPage->free(pFragment); - mpPage=NULL; + mpPage=nullptr; } bool select( bool bRefresh ) diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx index 8b273cd5e9cd..29b35a389f10 100644 --- a/canvas/source/tools/parametricpolypolygon.cxx +++ b/canvas/source/tools/parametricpolypolygon.cxx @@ -116,7 +116,7 @@ namespace canvas // TODO: NYI } - return NULL; + return nullptr; } ParametricPolyPolygon* ParametricPolyPolygon::createLinearHorizontalGradient( |