Mercurial > hg > orthanc-stone
diff Framework/Scene2DViewport/ViewportController.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 | 2b245953b44b |
line wrap: on
line diff
--- a/Framework/Scene2DViewport/ViewportController.cpp Wed May 29 08:36:13 2019 +0200 +++ b/Framework/Scene2DViewport/ViewportController.cpp Wed May 29 10:51:28 2019 +0200 @@ -35,12 +35,12 @@ scene_ = boost::make_shared<Scene2D>(); } - Scene2DConstPtr ViewportController::GetScene() const + boost::shared_ptr<const Scene2D> ViewportController::GetScene() const { return scene_; } - Scene2DPtr ViewportController::GetScene() + boost::shared_ptr<Scene2D> ViewportController::GetScene() { return scene_; } @@ -50,10 +50,10 @@ throw StoneException(ErrorCode_NotImplemented); } - std::vector<MeasureToolPtr> ViewportController::HitTestMeasureTools( + std::vector<boost::shared_ptr<MeasureTool>> ViewportController::HitTestMeasureTools( ScenePoint2D p) { - std::vector<MeasureToolPtr> ret; + std::vector<boost::shared_ptr<MeasureTool>> ret; for (size_t i = 0; i < measureTools_.size(); ++i) { @@ -91,7 +91,7 @@ BroadcastMessage(SceneTransformChanged(*this)); } - void ViewportController::PushCommand(TrackerCommandPtr command) + void ViewportController::PushCommand(boost::shared_ptr<TrackerCommand> command) { commandStack_.erase( commandStack_.begin() + numAppliedCommands_, @@ -127,14 +127,14 @@ return numAppliedCommands_ < commandStack_.size(); } - void ViewportController::AddMeasureTool(MeasureToolPtr measureTool) + void ViewportController::AddMeasureTool(boost::shared_ptr<MeasureTool> measureTool) { ORTHANC_ASSERT(std::find(measureTools_.begin(), measureTools_.end(), measureTool) == measureTools_.end(), "Duplicate measure tool"); measureTools_.push_back(measureTool); } - void ViewportController::RemoveMeasureTool(MeasureToolPtr measureTool) + void ViewportController::RemoveMeasureTool(boost::shared_ptr<MeasureTool> measureTool) { ORTHANC_ASSERT(std::find(measureTools_.begin(), measureTools_.end(), measureTool) != measureTools_.end(), "Measure tool not found");