Mercurial > hg > orthanc-stone
changeset 1608:646e581e115b
replacing nullptr by NULL for VS2008 compatibility
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 28 Oct 2020 22:21:06 +0100 |
| parents | 2df998314507 |
| children | 5f5c549499ff |
| files | OrthancStone/Sources/Scene2D/Internals/FixedPointAligner.cpp OrthancStone/Sources/Scene2DViewport/LayerHolder.cpp OrthancStone/Sources/Scene2DViewport/MeasureCommands.cpp OrthancStone/Sources/Scene2DViewport/MeasureTool.cpp OrthancStone/Sources/Scene2DViewport/MeasureTrackers.cpp OrthancStone/Sources/Scene2DViewport/OneGesturePointerTracker.cpp OrthancStone/Sources/Volumes/VolumeSceneLayerSource.cpp |
| diffstat | 7 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancStone/Sources/Scene2D/Internals/FixedPointAligner.cpp Wed Oct 28 21:55:30 2020 +0100 +++ b/OrthancStone/Sources/Scene2D/Internals/FixedPointAligner.cpp Wed Oct 28 22:21:06 2020 +0100 @@ -41,7 +41,7 @@ if (viewport) return viewport->Lock(); else - return nullptr; + return NULL; } void FixedPointAligner::Apply()
--- a/OrthancStone/Sources/Scene2DViewport/LayerHolder.cpp Wed Oct 28 21:55:30 2020 +0100 +++ b/OrthancStone/Sources/Scene2DViewport/LayerHolder.cpp Wed Oct 28 22:21:06 2020 +0100 @@ -49,7 +49,7 @@ if (viewport) return viewport->Lock(); else - return nullptr; + return NULL; } void LayerHolder::CreateLayers()
--- a/OrthancStone/Sources/Scene2DViewport/MeasureCommands.cpp Wed Oct 28 21:55:30 2020 +0100 +++ b/OrthancStone/Sources/Scene2DViewport/MeasureCommands.cpp Wed Oct 28 22:21:06 2020 +0100 @@ -34,7 +34,7 @@ if (viewport) return viewport->Lock(); else - return nullptr; + return NULL; }
--- a/OrthancStone/Sources/Scene2DViewport/MeasureTool.cpp Wed Oct 28 21:55:30 2020 +0100 +++ b/OrthancStone/Sources/Scene2DViewport/MeasureTool.cpp Wed Oct 28 22:21:06 2020 +0100 @@ -52,10 +52,10 @@ IViewport::ILock* MeasureTool::GetViewportLock() { boost::shared_ptr<IViewport> viewport = viewport_.lock(); - if(viewport) - return viewport->Lock(); + if (viewport) + return viewport->Lock(); else - return nullptr; + return NULL; } IViewport::ILock* MeasureTool::GetViewportLock() const @@ -64,7 +64,7 @@ if (viewport) return viewport->Lock(); else - return nullptr; + return NULL; } MeasureTool::MeasureTool(boost::weak_ptr<IViewport> viewport) :
--- a/OrthancStone/Sources/Scene2DViewport/MeasureTrackers.cpp Wed Oct 28 21:55:30 2020 +0100 +++ b/OrthancStone/Sources/Scene2DViewport/MeasureTrackers.cpp Wed Oct 28 22:21:06 2020 +0100 @@ -38,7 +38,7 @@ if (viewport) return viewport->Lock(); else - return nullptr; + return NULL; } void CreateMeasureTracker::Cancel() @@ -86,7 +86,7 @@ if (viewport) return viewport->Lock(); else - return nullptr; + return NULL; } void EditMeasureTracker::Cancel()
--- a/OrthancStone/Sources/Scene2DViewport/OneGesturePointerTracker.cpp Wed Oct 28 21:55:30 2020 +0100 +++ b/OrthancStone/Sources/Scene2DViewport/OneGesturePointerTracker.cpp Wed Oct 28 22:21:06 2020 +0100 @@ -37,11 +37,11 @@ IViewport::ILock* OneGesturePointerTracker::GetViewportLock() { - boost::shared_ptr<IViewport> viewport = viewport_.lock(); - if (viewport) - return viewport->Lock(); - else - return nullptr; + boost::shared_ptr<IViewport> viewport = viewport_.lock(); + if (viewport) + return viewport->Lock(); + else + return NULL; } void OneGesturePointerTracker::PointerUp(const PointerEvent& event)
--- a/OrthancStone/Sources/Volumes/VolumeSceneLayerSource.cpp Wed Oct 28 21:55:30 2020 +0100 +++ b/OrthancStone/Sources/Volumes/VolumeSceneLayerSource.cpp Wed Oct 28 22:21:06 2020 +0100 @@ -57,7 +57,7 @@ if (viewport) return viewport->Lock(); else - return nullptr; + return NULL; } IViewport::ILock* VolumeSceneLayerSource::GetViewportLock() const @@ -66,7 +66,7 @@ if (viewport) return viewport->Lock(); else - return nullptr; + return NULL; }