C++11 tidying.

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

diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index c08a767320635ca8360f6be97ecf3d84b0a50f6f..92aa86bf32b937d409b8337ba6e2850062991b23 100644 (file)
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -49,7 +49,7 @@ using std::list;
 using std::exception;
 using std::make_pair;
 using std::shared_ptr;
-using boost::function;
+using std::function;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
@@ -68,12 +68,12 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
 
        wxBoxSizer* type = new wxBoxSizer (wxHORIZONTAL);
        _type = new wxChoice (this, wxID_ANY);
-       _type->Append ("Modified Transitional 1", ((void *) dcp::MODIFIED_TRANSITIONAL_1));
-       _type->Append ("Multiple Modified Transitional 1", ((void *) dcp::MULTIPLE_MODIFIED_TRANSITIONAL_1));
-       _type->Append ("Modified Transitional 1 (without AuthorizedDeviceInfo)", ((void *) dcp::MODIFIED_TRANSITIONAL_TEST));
+       _type->Append ("Modified Transitional 1", ((void *) dcp::Formulation::MODIFIED_TRANSITIONAL_1));
+       _type->Append ("Multiple Modified Transitional 1", ((void *) dcp::Formulation::MULTIPLE_MODIFIED_TRANSITIONAL_1));
+       _type->Append ("Modified Transitional 1 (without AuthorizedDeviceInfo)", ((void *) dcp::Formulation::MODIFIED_TRANSITIONAL_TEST));
        if (!interop) {
-               _type->Append ("DCI Any", ((void *) dcp::DCI_ANY));
-               _type->Append ("DCI Specific", ((void *) dcp::DCI_SPECIFIC));
+               _type->Append ("DCI Any", ((void *) dcp::Formulation::DCI_ANY));
+               _type->Append ("DCI Specific", ((void *) dcp::Formulation::DCI_SPECIFIC));
        }
        type->Add (_type, 1, wxEXPAND);
        _type->SetSelection (0);
@@ -209,7 +209,7 @@ KDMOutputPanel::make (
                }
 
                bool cinemas_with_no_email = false;
-               BOOST_FOREACH (list<KDMWithMetadataPtr> i, cinema_kdms) {
+               for (auto i: cinema_kdms) {
                        if (i.front()->emails().empty()) {
                                cinemas_with_no_email = true;
                        }
@@ -224,8 +224,8 @@ KDMOutputPanel::make (
 
                if (proceed && Config::instance()->confirm_kdm_email ()) {
                        list<string> emails;
-                       BOOST_FOREACH (list<KDMWithMetadataPtr> const& i, cinema_kdms) {
-                               BOOST_FOREACH (string j, i.front()->emails()) {
+                       for (auto const& i: cinema_kdms) {
+                               for (auto j: i.front()->emails()) {
                                        emails.push_back (j);
                                }
                        }