X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_view.cc;h=44e575d9393bcc06a349d88901c1cb5b20021a10;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hp=da3ca6b6b781628c5541ec8c6a59a3368543e70c;hpb=e241f8b3c78acf3a70ae126ef141a8facc3782d6;p=dcpomatic.git diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc index da3ca6b6b..44e575d93 100644 --- a/src/wx/content_view.cc +++ b/src/wx/content_view.cc @@ -35,10 +35,10 @@ using std::string; using std::cout; using std::list; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using namespace dcpomatic; ContentView::ContentView (wxWindow* parent) @@ -106,7 +106,7 @@ ContentView::update () while (jm->work_to_do()) { if (!progress.Pulse()) { /* user pressed cancel */ - BOOST_FOREACH (shared_ptr i, jm->get()) { + for (auto i: jm->get()) { i->cancel(); } return; @@ -115,7 +115,7 @@ ContentView::update () } /* Add content from successful jobs and report errors */ - BOOST_FOREACH (shared_ptr i, jobs) { + for (auto i: jobs) { if (i->finished_in_error()) { error_dialog(this, std_to_wx(i->error_summary()) + ".\n", std_to_wx(i->error_details())); } else { @@ -156,7 +156,7 @@ ContentView::add (shared_ptr content) shared_ptr ContentView::get (string digest) const { - BOOST_FOREACH (shared_ptr i, _content) { + for (auto i: _content) { if (i->digest() == digest) { return i; }