BOOST_FOREACH.

[dcpomatic.git] / src / wx / closed_captions_dialog.cc

diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc
index 7411fa15377fbcd3a96179477128d21ffa7b958d..4f34f0531343dce91e946f90cda89b17c2c0d5bb 100644 (file)
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -32,8 +32,8 @@ using std::max;
 using std::cout;
 using std::pair;
 using std::make_pair;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
@@ -237,8 +237,8 @@ ClosedCaptionsDialog::update_tracks (shared_ptr<const Film> film)
 {
        _tracks.clear ();
 
-       BOOST_FOREACH (shared_ptr<Content> i, film->content()) {
-               BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
+       for (auto i: film->content()) {
+               for (auto j: i->text) {
                        if (j->use() && j->type() == TEXT_CLOSED_CAPTION && j->dcp_track()) {
                                if (find(_tracks.begin(), _tracks.end(), j->dcp_track()) == _tracks.end()) {
                                        _tracks.push_back (*j->dcp_track());
@@ -248,7 +248,7 @@ ClosedCaptionsDialog::update_tracks (shared_ptr<const Film> film)
        }
 
        _track->Clear ();
-       BOOST_FOREACH (DCPTextTrack const & i, _tracks) {
+       for (auto const& i: _tracks) {
                _track->Append (std_to_wx(String::compose("%1 (%2)", i.name, i.language)));
        }