# HG changeset patch # User Sebastien Jodogne # Date 1603920066 -3600 # Node ID 646e581e115b1a343f5b9c6ae8f41d9806b7bc8e # Parent 2df998314507f25d0c8c54571da1b88dfdc63897 replacing nullptr by NULL for VS2008 compatibility diff -r 2df998314507 -r 646e581e115b OrthancStone/Sources/Scene2D/Internals/FixedPointAligner.cpp --- 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() diff -r 2df998314507 -r 646e581e115b OrthancStone/Sources/Scene2DViewport/LayerHolder.cpp --- 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() diff -r 2df998314507 -r 646e581e115b OrthancStone/Sources/Scene2DViewport/MeasureCommands.cpp --- 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; } diff -r 2df998314507 -r 646e581e115b OrthancStone/Sources/Scene2DViewport/MeasureTool.cpp --- 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 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 viewport) : diff -r 2df998314507 -r 646e581e115b OrthancStone/Sources/Scene2DViewport/MeasureTrackers.cpp --- 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() diff -r 2df998314507 -r 646e581e115b OrthancStone/Sources/Scene2DViewport/OneGesturePointerTracker.cpp --- 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 viewport = viewport_.lock(); - if (viewport) - return viewport->Lock(); - else - return nullptr; + boost::shared_ptr viewport = viewport_.lock(); + if (viewport) + return viewport->Lock(); + else + return NULL; } void OneGesturePointerTracker::PointerUp(const PointerEvent& event) diff -r 2df998314507 -r 646e581e115b OrthancStone/Sources/Volumes/VolumeSceneLayerSource.cpp --- 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; }