X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fsubtitle_content.cc;fp=src%2Flib%2Fsubtitle_content.cc;h=5b3b453b6eaf12d7614c0a3b6beb2f2b87da3bdb;hp=9fd49831fd7f6b98914307501afe3d5def8ec2eb;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hpb=e669b562937786bf5b771c927cc03a4074b01be8 diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc index 9fd49831f..5b3b453b6 100644 --- a/src/lib/subtitle_content.cc +++ b/src/lib/subtitle_content.cc @@ -28,7 +28,6 @@ #include #include #include -#include #include #include "i18n.h" @@ -38,7 +37,6 @@ using std::vector; using std::cout; using std::list; using boost::shared_ptr; -using boost::make_shared; using boost::dynamic_pointer_cast; int const SubtitleContentProperty::X_OFFSET = 500; @@ -86,7 +84,6 @@ SubtitleContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version return shared_ptr (); } - /* Can't use make_shared here as the constructor is private */ return shared_ptr (new SubtitleContent (parent, node, version)); } @@ -133,7 +130,7 @@ SubtitleContent::SubtitleContent (Content* parent, cxml::ConstNodePtr node, int list fonts = node->node_children ("Font"); for (list::const_iterator i = fonts.begin(); i != fonts.end(); ++i) { - _fonts.push_back (make_shared (*i)); + _fonts.push_back (shared_ptr (new Font (*i))); } connect_to_fonts ();