Mercurial > hg > orthanc-stone
diff Framework/Scene2DViewport/MeasureTool.cpp @ 818:e42b491f1fb2
Removed typedefs to shared_ptr by making them explicit. Removed using namespace
directives to make usage more explicit, too.
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Wed, 29 May 2019 10:51:28 +0200 |
| parents | 66ac7a2d1e3a |
| children | 0aff28f15ea2 |
line wrap: on
line diff
--- a/Framework/Scene2DViewport/MeasureTool.cpp Wed May 29 08:36:13 2019 +0200 +++ b/Framework/Scene2DViewport/MeasureTool.cpp Wed May 29 10:51:28 2019 +0200 @@ -51,24 +51,24 @@ } - ViewportControllerConstPtr MeasureTool::GetController() const + boost::shared_ptr<const ViewportController> MeasureTool::GetController() const { - ViewportControllerConstPtr controller = controllerW_.lock(); + boost::shared_ptr<const ViewportController> controller = controllerW_.lock(); if (!controller) throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError, "Using dead ViewportController object!"); return controller; } - ViewportControllerPtr MeasureTool::GetController() + boost::shared_ptr<ViewportController> MeasureTool::GetController() { #if 1 return boost::const_pointer_cast<ViewportController> (const_cast<const MeasureTool*>(this)->GetController()); - //return boost::const_<ViewportControllerPtr> + //return boost::const_<boost::shared_ptr<ViewportController>> // (const_cast<const MeasureTool*>(this)->GetController()); #else - ViewportControllerPtr controller = controllerW_.lock(); + boost::shared_ptr<ViewportController> controller = controllerW_.lock(); if (!controller) throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError, "Using dead ViewportController object!"); @@ -76,18 +76,18 @@ #endif } - Scene2DPtr MeasureTool::GetScene() + boost::shared_ptr<Scene2D> MeasureTool::GetScene() { return GetController()->GetScene(); } - Scene2DConstPtr MeasureTool::GetScene() const + boost::shared_ptr<const Scene2D> MeasureTool::GetScene() const { return GetController()->GetScene(); } MeasureTool::MeasureTool(MessageBroker& broker, - ViewportControllerWPtr controllerW) + boost::weak_ptr<ViewportController> controllerW) : IObserver(broker) , controllerW_(controllerW) , enabled_(true) @@ -100,7 +100,7 @@ bool MeasureTool::IsSceneAlive() const { - ViewportControllerPtr controller = controllerW_.lock(); + boost::shared_ptr<ViewportController> controller = controllerW_.lock(); return (controller.get() != NULL); }