BOOST_FOREACH.

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

diff --git a/src/wx/dkdm_dialog.cc b/src/wx/dkdm_dialog.cc
index c77123526cf8fbc0191a3f85348d3c6cb4e39928..c46fed7600243a235665530c481758d86f9436be 100644 (file)
--- a/src/wx/dkdm_dialog.cc
+++ b/src/wx/dkdm_dialog.cc
@@ -46,9 +46,13 @@ using std::cout;
 using std::vector;
 using std::make_pair;
 using std::runtime_error;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::bind;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
 
 DKDMDialog::DKDMDialog (wxWindow* parent, shared_ptr<const Film> film)
        : wxDialog (parent, wxID_ANY, _("Make DKDMs"))
@@ -87,7 +91,7 @@ DKDMDialog::DKDMDialog (wxWindow* parent, shared_ptr<const Film> film)
        right->Add (h);
 
        vector<CPLSummary> cpls;
-       BOOST_FOREACH (CPLSummary const & i, film->cpls()) {
+       for (auto const& i: film->cpls()) {
                if (i.encrypted) {
                        cpls.push_back (i);
                }
@@ -149,7 +153,7 @@ DKDMDialog::make_clicked ()
 
        list<KDMWithMetadataPtr> kdms;
        try {
-               BOOST_FOREACH (shared_ptr<DKDMRecipient> i, _recipients->recipients()) {
+               for (auto i: _recipients->recipients()) {
                        KDMWithMetadataPtr p = kdm_for_dkdm_recipient (film, _cpl->cpl(), i, _timing->from(), _timing->until());
                        if (p) {
                                kdms.push_back (p);