X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftext_view.cc;h=3b674b5c17eb04562932ca23e54d2668cc144b89;hb=8fb0919c3c0f11f076eeda2a7d356f6284284ec6;hp=491df7b3b9693c16cca8313ea1f1a5d739bdfc79;hpb=e38ce84e7e2ce3c468fa60ab7c23afc0000e98de;p=dcpomatic.git diff --git a/src/wx/text_view.cc b/src/wx/text_view.cc index 491df7b3b..3b674b5c1 100644 --- a/src/wx/text_view.cc +++ b/src/wx/text_view.cc @@ -31,10 +31,10 @@ #include "lib/text_decoder.h" using std::list; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; using boost::bind; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using namespace dcpomatic; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; @@ -94,7 +94,7 @@ TextView::TextView ( _frc = film->active_frame_rate_change (content->position()); /* Find the decoder that is being used for our TextContent and attach to it */ - BOOST_FOREACH (shared_ptr i, decoder->text) { + for (auto i: decoder->text) { if (i->content() == text) { i->PlainStart.connect (bind (&TextView::data_start, this, _1)); i->Stop.connect (bind (&TextView::data_stop, this, _1)); @@ -107,7 +107,7 @@ TextView::TextView ( void TextView::data_start (ContentStringText cts) { - BOOST_FOREACH (dcp::SubtitleString const & i, cts.subs) { + for (auto const& i: cts.subs) { wxListItem list_item; list_item.SetId (_subs); _list->InsertItem (list_item);