Replace boost::shared_ptr

Replace boost::shared_ptr with C++11 smartpointer and remove the boost/shared_ptr.hpp header.

7 files changed, 19 insertions, 28 deletions

diff --git a/src/display/drawing-surface.h b/src/display/drawing-surface.h
index 7bec1606a..78471649a 100644
--- a/src/display/drawing-surface.h
+++ b/src/display/drawing-surface.h
@@ -12,7 +12,6 @@
 #ifndef SEEN_INKSCAPE_DISPLAY_DRAWING_SURFACE_H
 #define SEEN_INKSCAPE_DISPLAY_DRAWING_SURFACE_H
 
-#include <boost/shared_ptr.hpp>
 #include <cairo.h>
 #include <2geom/affine.h>
 #include <2geom/rect.h>
diff --git a/src/event-log.cpp b/src/event-log.cpp
index 5a73b649e..41ab2f2d0 100644
--- a/src/event-log.cpp
+++ b/src/event-log.cpp
@@ -12,8 +12,6 @@
 
 #include "event-log.h"
 #include <glibmm/i18n.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
 
 #include "desktop.h"
 #include "inkscape.h"
@@ -60,9 +58,9 @@ public:
     Inkscape::EventLog::CallbackMap *_callbacks;
 };
 
-void addBlocker(std::vector<boost::shared_ptr<SignalBlocker> > &blockers, sigc::connection *connection)
+void addBlocker(std::vector<std::unique_ptr<SignalBlocker> > &blockers, sigc::connection *connection)
 {
-    blockers.push_back(boost::make_shared<SignalBlocker>(connection));
+    blockers.emplace_back(new SignalBlocker(connection));
 }
 
 
@@ -98,7 +96,7 @@ public:
             dlg._event_list_selection->set_mode(Gtk::SELECTION_SINGLE);
 
             {
-                std::vector<boost::shared_ptr<SignalBlocker> > blockers;
+                std::vector<std::unique_ptr<SignalBlocker> > blockers;
                 addBlocker(blockers, &(*dlg._callback_connections)[Inkscape::EventLog::CALLB_SELECTION_CHANGE]);
                 addBlocker(blockers, &(*dlg._callback_connections)[Inkscape::EventLog::CALLB_EXPAND]);
 
@@ -119,7 +117,7 @@ public:
 
     void collapseRow(Gtk::TreeModel::Path const &path)
     {
-        std::vector<boost::shared_ptr<SignalBlocker> > blockers;
+        std::vector<std::unique_ptr<SignalBlocker> > blockers;
         for (std::vector<DialogConnection>::iterator it(_connections.begin()); it != _connections.end(); ++it)
         {
             addBlocker(blockers, &(*it->_callback_connections)[Inkscape::EventLog::CALLB_SELECTION_CHANGE]);
@@ -134,7 +132,7 @@ public:
 
     void selectRow(Gtk::TreeModel::Path const &path)
     {
-        std::vector<boost::shared_ptr<SignalBlocker> > blockers;
+        std::vector<std::unique_ptr<SignalBlocker> > blockers;
         for (std::vector<DialogConnection>::iterator it(_connections.begin()); it != _connections.end(); ++it)
         {
             addBlocker(blockers, &(*it->_callback_connections)[Inkscape::EventLog::CALLB_SELECTION_CHANGE]);
@@ -152,7 +150,7 @@ public:
     void clearEventList(Glib::RefPtr<Gtk::TreeStore> eventListStore)
     {
         if (eventListStore) {
-            std::vector<boost::shared_ptr<SignalBlocker> > blockers;
+            std::vector<std::unique_ptr<SignalBlocker> > blockers;
             for (std::vector<DialogConnection>::iterator it(_connections.begin()); it != _connections.end(); ++it)
             {
                 addBlocker(blockers, &(*it->_callback_connections)[Inkscape::EventLog::CALLB_SELECTION_CHANGE]);
diff --git a/src/ui/tool/manipulator.h b/src/ui/tool/manipulator.h
index 0f26c6de1..66b47ce98 100644
--- a/src/ui/tool/manipulator.h
+++ b/src/ui/tool/manipulator.h
@@ -17,7 +17,6 @@
 #include <sigc++/sigc++.h>
 #include <glib.h>
 #include <gdk/gdk.h>
-#include <boost/shared_ptr.hpp>
 #include "ui/tools/tool-base.h"
 
 class SPDesktop;
@@ -76,14 +75,14 @@ template <typename T>
 class MultiManipulator : public PointManipulator {
 public:
     //typedef typename T::ItemType ItemType;
-    typedef typename std::pair<void*, boost::shared_ptr<T> > MapPair;
-    typedef typename std::map<void*, boost::shared_ptr<T> > MapType;
+    typedef typename std::pair<void*, std::shared_ptr<T> > MapPair;
+    typedef typename std::map<void*, std::shared_ptr<T> > MapType;
 
     MultiManipulator(SPDesktop *d, ControlPointSelection &sel)
         : PointManipulator(d, sel)
     {}
     void addItem(void *item) {
-        boost::shared_ptr<T> m(_createManipulator(item));
+        std::shared_ptr<T> m(_createManipulator(item));
         _mmap.insert(MapPair(item, m));
     }
     void removeItem(void *item) {
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
diff --git a/src/ui/tool/multi-path-manipulator.h b/src/ui/tool/multi-path-manipulator.h
index 4f152e0a2..742c6d421 100644
--- a/src/ui/tool/multi-path-manipulator.h
+++ b/src/ui/tool/multi-path-manipulator.h
@@ -77,8 +77,8 @@ public:
     sigc::signal<void> signal_coords_changed; /// Emitted whenever the coordinates
         /// shown in the status bar need updating
 private:
-    typedef std::pair<ShapeRecord, boost::shared_ptr<PathManipulator> > MapPair;
-    typedef std::map<ShapeRecord, boost::shared_ptr<PathManipulator> > MapType;
+    typedef std::pair<ShapeRecord, std::shared_ptr<PathManipulator> > MapPair;
+    typedef std::map<ShapeRecord, std::shared_ptr<PathManipulator> > MapType;
 
     template <typename R>
     void invokeForAll(R (PathManipulator::*method)()) {
@@ -88,11 +88,11 @@ private:
             // be a valid iterator and then assign i to it.
             MapType::iterator next_i = i;
             ++next_i;
-            // i->second is a boost::shared_ptr so try to hold on to it so
+            // i->second is a std::shared_ptr so try to hold on to it so
             // it won't get freed prematurely by the WriteXML() method or
             // whatever. See https://bugs.launchpad.net/inkscape/+bug/1617615
             // Applicable to empty paths.
-            boost::shared_ptr<PathManipulator> hold(i->second);
+            std::shared_ptr<PathManipulator> hold(i->second);
             ((hold.get())->*method)();
             i = next_i;
         }
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; }
diff --git a/src/ui/tool/path-manipulator.h b/src/ui/tool/path-manipulator.h
index 283cb610a..5fa24c23b 100644
--- a/src/ui/tool/path-manipulator.h
+++ b/src/ui/tool/path-manipulator.h
@@ -15,8 +15,6 @@
 #include <memory>
 #include <2geom/pathvector.h>
 #include <2geom/affine.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 #include "ui/tool/node.h"
 #include "ui/tool/manipulator.h"
 #include "live_effects/lpe-bspline.h"
@@ -105,7 +103,7 @@ public:
     static bool is_item_type(void *item);
 private:
     typedef NodeList Subpath;
-    typedef boost::shared_ptr<NodeList> SubpathPtr;
+    typedef std::shared_ptr<NodeList> SubpathPtr;
 
     void _createControlPointsFromGeometry();