summaryrefslogtreecommitdiffstats
path: root/src/event-log.cpp
diff options
context:
space:
mode:
authorJan Lingscheid <jan.linscheid@auticon.de>2017-10-17 06:31:32 +0000
committerJan Lingscheid <jan.lingscheid@auticon.de>2017-10-17 08:55:01 +0000
commite1cb749aab3c773073b1adde1b4cd07b2a6ce93e (patch)
treed949d760d817874ccdbef766661643c1f98822f2 /src/event-log.cpp
parentReplace boost::scoped_ptr (diff)
downloadinkscape-e1cb749aab3c773073b1adde1b4cd07b2a6ce93e.tar.gz
inkscape-e1cb749aab3c773073b1adde1b4cd07b2a6ce93e.zip
Replace boost::shared_ptr
Replace boost::shared_ptr with C++11 smartpointer and remove the boost/shared_ptr.hpp header.
Diffstat (limited to 'src/event-log.cpp')
-rw-r--r--src/event-log.cpp14
1 files changed, 6 insertions, 8 deletions
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]);