diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-10-20 18:50:29 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-10-20 18:50:29 +0000 |
| commit | 683029f31f0f1814c21ca65f7f113ac12b6242fb (patch) | |
| tree | 4d4adb5dcfc962c4caaebaf6b448cc8b6477a194 /src/ui/tool/multi-path-manipulator.cpp | |
| parent | Merge branch 'cleanups' of gitlab.com:stfacc/inkscape (diff) | |
| parent | Refactor Util::ptr_shared (diff) | |
| download | inkscape-683029f31f0f1814c21ca65f7f113ac12b6242fb.tar.gz inkscape-683029f31f0f1814c21ca65f7f113ac12b6242fb.zip | |
Merge branch 'smartpointer_refactor' of gitlab.com:jali/inkscape
Diffstat (limited to 'src/ui/tool/multi-path-manipulator.cpp')
| -rw-r--r-- | src/ui/tool/multi-path-manipulator.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ui/tool/multi-path-manipulator.cpp b/src/ui/tool/multi-path-manipulator.cpp index f30c7e349..9cfa4ed31 100644 --- a/src/ui/tool/multi-path-manipulator.cpp +++ b/src/ui/tool/multi-path-manipulator.cpp @@ -10,7 +10,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <boost/shared_ptr.hpp> #include "node.h" #include <glibmm/i18n.h> #include "desktop.h" @@ -161,7 +160,7 @@ void MultiPathManipulator::setItems(std::set<ShapeRecord> const &s) if (sr.edit_transform != sr_new.edit_transform || sr.role != sr_new.role) { - boost::shared_ptr<PathManipulator> hold(i->second); + std::shared_ptr<PathManipulator> hold(i->second); if (sr.edit_transform != sr_new.edit_transform) hold->setControlsTransform(sr_new.edit_transform); if (sr.role != sr_new.role) { @@ -179,7 +178,7 @@ void MultiPathManipulator::setItems(std::set<ShapeRecord> const &s) for (std::set<ShapeRecord>::iterator i = shapes.begin(); i != shapes.end(); ++i) { ShapeRecord const &r = *i; if (!SP_IS_PATH(r.item) && !IS_LIVEPATHEFFECT(r.item)) continue; - boost::shared_ptr<PathManipulator> newpm(new PathManipulator(*this, (SPPath*) r.item, + std::shared_ptr<PathManipulator> newpm(new PathManipulator(*this, (SPPath*) r.item, r.edit_transform, _getOutlineColor(r.role, r.item), r.lpe_key)); newpm->showHandles(_show_handles); // always show outlines for clips and masks |