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/node.h | |
| 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/node.h')
| -rw-r--r-- | src/ui/tool/node.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/ui/tool/node.h b/src/ui/tool/node.h index a05f0e3b9..2964b66ca 100644 --- a/src/ui/tool/node.h +++ b/src/ui/tool/node.h @@ -22,8 +22,6 @@ #include <cstddef> #include <functional> -#include <boost/enable_shared_from_this.hpp> -#include <boost/shared_ptr.hpp> #include "ui/tool/selectable-control-point.h" #include "snapped-point.h" #include "ui/tool/node-types.h" @@ -357,7 +355,7 @@ private: friend class NodeList; }; -class NodeList : ListNode, boost::noncopyable, public boost::enable_shared_from_this<NodeList> { +class NodeList : ListNode, boost::noncopyable { public: typedef std::size_t size_type; typedef Node &reference; @@ -465,9 +463,9 @@ private: * List of node lists. Represents an editable path. * Editable path composed of one or more subpaths. */ -class SubpathList : public std::list< boost::shared_ptr<NodeList> > { +class SubpathList : public std::list< std::shared_ptr<NodeList> > { public: - typedef std::list< boost::shared_ptr<NodeList> > list_type; + typedef std::list< std::shared_ptr<NodeList> > list_type; SubpathList(PathManipulator &pm) : _path_manipulator(pm) {} PathManipulator &pm() { return _path_manipulator; } |