X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsend_kdm_email_job.cc;h=fee7e9d3164eac66dcc170b48d330be5288048e2;hb=0330b684fe616b465e65b67f7d995e659fa83fca;hp=55a1718114a2566c29ec6ad5680c0be174dfcb59;hpb=47e29203daec51d313ed8ab8ef759752bce18d45;p=dcpomatic.git

diff --git a/src/lib/send_kdm_email_job.cc b/src/lib/send_kdm_email_job.cc
index 55a171811..fee7e9d31 100644
--- a/src/lib/send_kdm_email_job.cc
+++ b/src/lib/send_kdm_email_job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "send_kdm_email_job.h"
 #include "compose.hpp"
 #include "kdm_with_metadata.h"
@@ -26,11 +27,13 @@
 
 #include "i18n.h"
 
+
 using std::string;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 
+
 SendKDMEmailJob::SendKDMEmailJob (
 	list<KDMWithMetadataPtr> kdms,
 	dcp::NameFormat container_name_format,
@@ -42,13 +45,14 @@ SendKDMEmailJob::SendKDMEmailJob (
 	, _filename_format (filename_format)
 	, _cpl_name (cpl_name)
 {
-	BOOST_FOREACH (KDMWithMetadataPtr i, kdms) {
+	for (auto i: kdms) {
 		list<KDMWithMetadataPtr> s;
 		s.push_back (i);
 		_kdms.push_back (s);
 	}
 }
 
+
 /** @param kdms KDMs to email.
  *  @param container_name_format Format to ues for folders / ZIP files.
  *  @param filename_format Format to use for filenames.
@@ -70,15 +74,17 @@ SendKDMEmailJob::SendKDMEmailJob (
 
 }
 
+
 SendKDMEmailJob::~SendKDMEmailJob ()
 {
 	stop_thread ();
 }
 
+
 string
 SendKDMEmailJob::name () const
 {
-	optional<string> f = _kdms.front().front()->get('f');
+	auto f = _kdms.front().front()->get('f');
 	if (!f || f->empty()) {
 		return _("Email KDMs");
 	}
@@ -86,17 +92,19 @@ SendKDMEmailJob::name () const
 	return String::compose (_("Email KDMs for %2"), *f);
 }
 
+
 string
 SendKDMEmailJob::json_name () const
 {
 	return N_("send_kdm_email");
 }
 
+
 void
 SendKDMEmailJob::run ()
 {
 	set_progress_unknown ();
-	email (_kdms, _container_name_format, _filename_format, _cpl_name);
+	send_emails (_kdms, _container_name_format, _filename_format, _cpl_name);
 	set_progress (1);
 	set_state (FINISHED_OK);
 }