X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdkdm_output_panel.cc;h=952a7d90425d7c1a48affdf2eff5d4fd02eb2c03;hb=00cc999455e060630a5914e7a70489ff98219b49;hp=762ed7b7e71e07aef8d7019bbddd110cefe92cba;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/wx/dkdm_output_panel.cc b/src/wx/dkdm_output_panel.cc
index 762ed7b7e..952a7d904 100644
--- a/src/wx/dkdm_output_panel.cc
+++ b/src/wx/dkdm_output_panel.cc
@@ -18,34 +18,40 @@
 
 */
 
-#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
+LIBDCP_ENABLE_WARNINGS
 #endif
+
+LIBDCP_DISABLE_WARNINGS
 #include <wx/stdpaths.h>
+LIBDCP_ENABLE_WARNINGS
+
 
-using std::pair;
-using std::string;
-using std::list;
 using std::exception;
+using std::function;
+using std::list;
 using std::make_pair;
+using std::pair;
 using std::shared_ptr;
-using boost::function;
+using std::string;
 
 
 DKDMOutputPanel::DKDMOutputPanel (wxWindow* parent)
@@ -88,8 +94,8 @@ DKDMOutputPanel::DKDMOutputPanel (wxWindow* parent)
 	table->Add (_email, 1, wxEXPAND);
 	table->AddSpacer (0);
 
-	_write_to->Bind (wxEVT_CHECKBOX, boost::bind(&DKDMOutputPanel::setup_sensitivity, this));
-	_email->Bind (wxEVT_CHECKBOX, boost::bind(&DKDMOutputPanel::setup_sensitivity, this));
+	_write_to->bind(&DKDMOutputPanel::setup_sensitivity, this);
+	_email->bind(&DKDMOutputPanel::setup_sensitivity, this);
 
 	SetSizer (table);
 }
@@ -119,7 +125,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 +140,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);
 				}
 			}
@@ -172,7 +178,8 @@ DKDMOutputPanel::make (
 					kdms,
 					_filename_format->get(),
 					_filename_format->get(),
-					name
+					name,
+					{}
 					)
 				);
 		}