X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fstring_text_file_decoder.cc;h=f24147851847e1ee120354984f2dbd40f20630a7;hb=ccacce39c39d16977ab6c1592fcb6e941b05ddff;hp=691734d7bbf11d1d218efa139dc3eb01b44c6e2d;hpb=ddcd4f3ba0af3e9d49dbb68127317cd0d871a248;p=dcpomatic.git diff --git a/src/lib/string_text_file_decoder.cc b/src/lib/string_text_file_decoder.cc index 691734d7b..f24147851 100644 --- a/src/lib/string_text_file_decoder.cc +++ b/src/lib/string_text_file_decoder.cc @@ -23,7 +23,6 @@ #include "text_content.h" #include "text_decoder.h" #include -#include #include using std::list; @@ -31,9 +30,9 @@ using std::vector; using std::string; using std::cout; using std::max; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using namespace dcpomatic; StringTextFileDecoder::StringTextFileDecoder (shared_ptr film, shared_ptr content) @@ -95,8 +94,8 @@ vector StringTextFileDecoder::fonts () const { vector data; - BOOST_FOREACH (shared_ptr i, text) { - BOOST_FOREACH (shared_ptr j, i->content()->fonts()) { + for (auto i: text) { + for (auto j: i->content()->fonts()) { data.push_back (FontData(j)); } }