Use libdcp's warnings.h

[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 d8645ff9713d5e8a24d51aded011e87fb1ac4f23..5b04f740a4a2ab3db6acf7bb70f32e9454c60cc9 100644 (file)
--- a/src/wx/dkdm_output_panel.cc
+++ b/src/wx/dkdm_output_panel.cc
@@ -18,34 +18,36 @@
 
 */
 
-#include "lib/config.h"
-#include "lib/send_kdm_email_job.h"
-#include "lib/warnings.h"
+
+#include "check_box.h"
+#include "confirm_kdm_email_dialog.h"
+#include "dcpomatic_button.h"
 #include "dkdm_output_panel.h"
 #include "kdm_timing_panel.h"
-#include "confirm_kdm_email_dialog.h"
-#include "wx_util.h"
 #include "name_format_editor.h"
-#include "check_box.h"
-#include "dcpomatic_button.h"
+#include "wx_util.h"
+#include "lib/config.h"
+#include "lib/send_kdm_email_job.h"
 #include <dcp/exceptions.h>
 #include <dcp/types.h>
+#include <dcp/warnings.h>
 #ifdef DCPOMATIC_USE_OWN_PICKER
 #include "dir_picker_ctrl.h"
 #else
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
-#endif
 #include <wx/stdpaths.h>
+LIBDCP_ENABLE_WARNINGS
+#endif
+
 
-using std::pair;
-using std::string;
-using std::list;
 using std::exception;
+using std::function;
+using std::list;
 using std::make_pair;
-using boost::shared_ptr;
-using boost::function;
+using std::pair;
+using std::shared_ptr;
+using std::string;
 
 
 DKDMOutputPanel::DKDMOutputPanel (wxWindow* parent)
@@ -119,7 +121,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;
                        }
@@ -134,8 +136,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);
                                }
                        }