C++11 tidying.

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

diff --git a/src/wx/dkdm_output_panel.cc b/src/wx/dkdm_output_panel.cc
index 3f8730ae3a06e108c3d54866eac0d3236dddd933..cf6189efa7192a961f5727a224441ef543fb9fe4 100644 (file)
--- a/src/wx/dkdm_output_panel.cc
+++ b/src/wx/dkdm_output_panel.cc
@@ -20,6 +20,7 @@
 
 #include "lib/config.h"
 #include "lib/send_kdm_email_job.h"
+#include "lib/warnings.h"
 #include "dkdm_output_panel.h"
 #include "kdm_timing_panel.h"
 #include "confirm_kdm_email_dialog.h"
@@ -32,7 +33,9 @@
 #ifdef DCPOMATIC_USE_OWN_PICKER
 #include "dir_picker_ctrl.h"
 #else
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/filepicker.h>
+DCPOMATIC_ENABLE_WARNINGS
 #endif
 #include <wx/stdpaths.h>
 
@@ -41,8 +44,8 @@ using std::string;
 using std::list;
 using std::exception;
 using std::make_pair;
-using boost::shared_ptr;
-using boost::function;
+using std::shared_ptr;
+using std::function;
 
 
 DKDMOutputPanel::DKDMOutputPanel (wxWindow* parent)
@@ -116,7 +119,7 @@ DKDMOutputPanel::make (
                }
 
                bool kdms_with_no_email = false;
-               BOOST_FOREACH (KDMWithMetadataPtr i, kdms) {
+               for (auto i: kdms) {
                        if (i->emails().empty()) {
                                kdms_with_no_email = true;
                        }
@@ -131,8 +134,8 @@ DKDMOutputPanel::make (
 
                if (proceed && Config::instance()->confirm_kdm_email()) {
                        list<string> emails;
-                       BOOST_FOREACH (KDMWithMetadataPtr const& i, kdms) {
-                               BOOST_FOREACH (string j, i->emails()) {
+                       for (auto const& i: kdms) {
+                               for (auto j: i->emails()) {
                                        emails.push_back (j);
                                }
                        }