Mercurial > hg > orthanc-stone

diff Framework/Scene2DViewport/MeasureCommands.cpp @ 818:e42b491f1fb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 712ff6ff3c19
children c71ef52602a0
line wrap: on
line diff
--- a/Framework/Scene2DViewport/MeasureCommands.cpp	Wed May 29 08:36:13 2019 +0200
+++ b/Framework/Scene2DViewport/MeasureCommands.cpp	Wed May 29 10:51:28 2019 +0200
@@ -38,7 +38,7 @@
     GetController()->AddMeasureTool(GetMeasureTool());
   }
 
-  CreateMeasureCommand::CreateMeasureCommand(ViewportControllerWPtr controllerW)
+  CreateMeasureCommand::CreateMeasureCommand(boost::weak_ptr<ViewportController> controllerW)
     : TrackerCommand(controllerW)
   {
 
@@ -52,7 +52,7 @@
 
   CreateLineMeasureCommand::CreateLineMeasureCommand(
     MessageBroker&         broker, 
-    ViewportControllerWPtr controllerW,
+    boost::weak_ptr<ViewportController> controllerW,
     ScenePoint2D           point)
     : CreateMeasureCommand(controllerW)
     , measureTool_(
@@ -69,7 +69,7 @@
 
   CreateAngleMeasureCommand::CreateAngleMeasureCommand(
     MessageBroker&         broker, 
-    ViewportControllerWPtr controllerW,
+    boost::weak_ptr<ViewportController> controllerW,
     ScenePoint2D           point)
     : CreateMeasureCommand(controllerW)
     , measureTool_(
@@ -93,9 +93,9 @@
     measureTool_->SetSide2End(scenePos);
   }
 
-  ViewportControllerPtr TrackerCommand::GetController()
+  boost::shared_ptr<ViewportController> TrackerCommand::GetController()
   {
-    ViewportControllerPtr controller = controllerW_.lock();
+    boost::shared_ptr<ViewportController> controller = controllerW_.lock();
     assert(controller); // accessing dead object?
     return controller;
   }