White space: kdm_with_metadata.{cc,h} send_kdm_email_job.{cc,h}

4 files changed, 72 insertions, 72 deletions

diff --git a/src/lib/kdm_with_metadata.cc b/src/lib/kdm_with_metadata.cc
index f7ff84435..d09f6930b 100644
--- a/src/lib/kdm_with_metadata.cc
+++ b/src/lib/kdm_with_metadata.cc
@@ -44,7 +44,7 @@ using boost::optional;
 
 
 int
-write_files (
+write_files(
 	list<KDMWithMetadataPtr> kdms,
 	boost::filesystem::path directory,
 	dcp::NameFormat name_format,
@@ -56,7 +56,7 @@ write_files (
 	if (directory == "-") {
 		/* Write KDMs to the stdout */
 		for (auto i: kdms) {
-			cout << i->kdm_as_xml ();
+			cout << i->kdm_as_xml();
 			++written;
 		}
 
@@ -71,7 +71,7 @@ write_files (
 	for (auto i: kdms) {
 		auto out = directory / careful_string_filter(name_format.get(i->name_values(), ".xml"));
 		if (!dcp::filesystem::exists(out) || confirm_overwrite(out)) {
-			i->kdm_as_xml (out);
+			i->kdm_as_xml(out);
 			++written;
 		}
 	}
@@ -81,9 +81,9 @@ write_files (
 
 
 optional<string>
-KDMWithMetadata::get (char k) const
+KDMWithMetadata::get(char k) const
 {
-	auto i = _name_values.find (k);
+	auto i = _name_values.find(k);
 	if (i == _name_values.end()) {
 		return {};
 	}
@@ -93,16 +93,16 @@ KDMWithMetadata::get (char k) const
 
 
 void
-make_zip_file (list<KDMWithMetadataPtr> kdms, boost::filesystem::path zip_file, dcp::NameFormat name_format)
+make_zip_file(list<KDMWithMetadataPtr> kdms, boost::filesystem::path zip_file, dcp::NameFormat name_format)
 {
-	Zipper zipper (zip_file);
+	Zipper zipper(zip_file);
 
 	for (auto i: kdms) {
 		auto const name = careful_string_filter(name_format.get(i->name_values(), ".xml"));
-		zipper.add (name, i->kdm_as_xml());
+		zipper.add(name, i->kdm_as_xml());
 	}
 
-	zipper.close ();
+	zipper.close();
 }
 
 
@@ -110,25 +110,25 @@ make_zip_file (list<KDMWithMetadataPtr> kdms, boost::filesystem::path zip_file,
  *  each list contains the KDMs for one list.
  */
 list<list<KDMWithMetadataPtr>>
-collect (list<KDMWithMetadataPtr> kdms)
+collect(list<KDMWithMetadataPtr> kdms)
 {
 	list<list<KDMWithMetadataPtr>> grouped;
 
 	for (auto i: kdms) {
 
-		auto j = grouped.begin ();
+		auto j = grouped.begin();
 
 		while (j != grouped.end()) {
 			if (j->front()->group() == i->group()) {
-				j->push_back (i);
+				j->push_back(i);
 				break;
 			}
 			++j;
 		}
 
 		if (j == grouped.end()) {
-			grouped.push_back (list<KDMWithMetadataPtr>());
-			grouped.back().push_back (i);
+			grouped.push_back(list<KDMWithMetadataPtr>());
+			grouped.back().push_back(i);
 		}
 	}
 
@@ -138,7 +138,7 @@ collect (list<KDMWithMetadataPtr> kdms)
 
 /** Write one directory per list into another directory */
 int
-write_directories (
+write_directories(
 	list<list<KDMWithMetadataPtr>> kdms,
 	boost::filesystem::path directory,
 	dcp::NameFormat container_name_format,
@@ -164,7 +164,7 @@ write_directories (
 
 /** Write one ZIP file per cinema into a directory */
 int
-write_zip_files (
+write_zip_files(
 	list<list<KDMWithMetadataPtr>> kdms,
 	boost::filesystem::path directory,
 	dcp::NameFormat container_name_format,
@@ -199,7 +199,7 @@ write_zip_files (
  *  @param cpl_name Name of the CPL that the KDMs are for.
  */
 void
-send_emails (
+send_emails(
 	list<list<KDMWithMetadataPtr>> kdms,
 	dcp::NameFormat container_name_format,
 	dcp::NameFormat filename_format,
@@ -207,7 +207,7 @@ send_emails (
 	vector<string> extra_addresses
 	)
 {
-	auto config = Config::instance ();
+	auto config = Config::instance();
 
 	if (config->mail_server().empty()) {
 		throw MissingConfigurationError(_("No outgoing mail server configured in the Email tab of preferences"));
@@ -224,7 +224,7 @@ send_emails (
 		auto zip_file = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
 		dcp::filesystem::create_directories(zip_file);
 		zip_file /= container_name_format.get(first->name_values(), ".zip");
-		make_zip_file (kdms_for_cinema, zip_file, filename_format);
+		make_zip_file(kdms_for_cinema, zip_file, filename_format);
 
 		auto substitute_variables = [cpl_name, first](string target) {
 			boost::algorithm::replace_all(target, "$CPL_NAME", cpl_name);
@@ -260,13 +260,13 @@ send_emails (
 		}
 
 		for (auto cc: config->kdm_cc()) {
-			email.add_cc (cc);
+			email.add_cc(cc);
 		}
 		if (!config->kdm_bcc().empty()) {
-			email.add_bcc (config->kdm_bcc());
+			email.add_bcc(config->kdm_bcc());
 		}
 
-		email.add_attachment (zip_file, container_name_format.get(first->name_values(), ".zip"), "application/zip");
+		email.add_attachment(zip_file, container_name_format.get(first->name_values(), ".zip"), "application/zip");
 		dcp::filesystem::remove(zip_file);
 
 		auto log_details = [](Email& email) {
@@ -277,12 +277,12 @@ send_emails (
 		};
 
 		try {
-			email.send (config->mail_server(), config->mail_port(), config->mail_protocol(), config->mail_user(), config->mail_password());
+			email.send(config->mail_server(), config->mail_port(), config->mail_protocol(), config->mail_user(), config->mail_password());
 		} catch (...) {
-			log_details (email);
+			log_details(email);
 			throw;
 		}
 
-		log_details (email);
+		log_details(email);
 	}
 }
diff --git a/src/lib/kdm_with_metadata.h b/src/lib/kdm_with_metadata.h
index 6198564b1..40667f9ff 100644
--- a/src/lib/kdm_with_metadata.h
+++ b/src/lib/kdm_with_metadata.h
@@ -35,25 +35,25 @@ class KDMWithMetadata
 {
 public:
 	KDMWithMetadata(dcp::NameFormat::Map const& name_values, ID group, std::vector<std::string> emails, dcp::EncryptedKDM kdm)
-		: _name_values (name_values)
-		, _group (group)
-		, _emails (emails)
-		, _kdm (kdm)
+		: _name_values(name_values)
+		, _group(group)
+		, _emails(emails)
+		, _kdm(kdm)
 	{}
 
-	std::string kdm_as_xml () const {
-		return _kdm.as_xml ();
+	std::string kdm_as_xml() const {
+		return _kdm.as_xml();
 	}
 
-	void kdm_as_xml (boost::filesystem::path out) const {
-		return _kdm.as_xml (out);
+	void kdm_as_xml(boost::filesystem::path out) const {
+		return _kdm.as_xml(out);
 	}
 
-	dcp::NameFormat::Map const& name_values () const {
+	dcp::NameFormat::Map const& name_values() const {
 		return _name_values;
 	}
 
-	boost::optional<std::string> get (char k) const;
+	boost::optional<std::string> get(char k) const;
 
 	ID group() const {
 		return _group;
@@ -74,19 +74,19 @@ private:
 typedef std::shared_ptr<KDMWithMetadata> KDMWithMetadataPtr;
 
 
-int write_files (
+int write_files(
 	std::list<KDMWithMetadataPtr> screen_kdms, boost::filesystem::path directory,
 	dcp::NameFormat name_format, std::function<bool (boost::filesystem::path)> confirm_overwrite
 	);
 
 
-void make_zip_file (std::list<KDMWithMetadataPtr> kdms, boost::filesystem::path zip_file, dcp::NameFormat name_format);
+void make_zip_file(std::list<KDMWithMetadataPtr> kdms, boost::filesystem::path zip_file, dcp::NameFormat name_format);
 
 
-std::list<std::list<KDMWithMetadataPtr>> collect (std::list<KDMWithMetadataPtr> kdms);
+std::list<std::list<KDMWithMetadataPtr>> collect(std::list<KDMWithMetadataPtr> kdms);
 
 
-int write_directories (
+int write_directories(
 		std::list<std::list<KDMWithMetadataPtr>> kdms,
 		boost::filesystem::path directory,
 		dcp::NameFormat container_name_format,
@@ -95,7 +95,7 @@ int write_directories (
 		);
 
 
-int write_zip_files (
+int write_zip_files(
 		std::list<std::list<KDMWithMetadataPtr>> kdms,
 		boost::filesystem::path directory,
 		dcp::NameFormat container_name_format,
@@ -104,7 +104,7 @@ int write_zip_files (
 		);
 
 
-void send_emails (
+void send_emails(
 		std::list<std::list<KDMWithMetadataPtr>> kdms,
 		dcp::NameFormat container_name_format,
 		dcp::NameFormat filename_format,
diff --git a/src/lib/send_kdm_email_job.cc b/src/lib/send_kdm_email_job.cc
index 59e33d4bc..15080d833 100644
--- a/src/lib/send_kdm_email_job.cc
+++ b/src/lib/send_kdm_email_job.cc
@@ -35,23 +35,23 @@ using std::vector;
 using boost::optional;
 
 
-SendKDMEmailJob::SendKDMEmailJob (
+SendKDMEmailJob::SendKDMEmailJob(
 	list<KDMWithMetadataPtr> kdms,
 	dcp::NameFormat container_name_format,
 	dcp::NameFormat filename_format,
 	string cpl_name,
 	vector<string> extra_addresses
 	)
-	: Job (shared_ptr<Film>())
-	, _container_name_format (container_name_format)
-	, _filename_format (filename_format)
-	, _cpl_name (cpl_name)
-	, _extra_addresses (extra_addresses)
+	: Job({})
+	, _container_name_format(container_name_format)
+	, _filename_format(filename_format)
+	, _cpl_name(cpl_name)
+	, _extra_addresses(extra_addresses)
 {
 	for (auto i: kdms) {
 		list<KDMWithMetadataPtr> s;
-		s.push_back (i);
-		_kdms.push_back (s);
+		s.push_back(i);
+		_kdms.push_back(s);
 	}
 }
 
@@ -62,54 +62,54 @@ SendKDMEmailJob::SendKDMEmailJob (
  *  @param name_values Values to substitute into \p container_name_format and \p filename_format.
  *  @param cpl_name Name of the CPL that the KDMs are for.
  */
-SendKDMEmailJob::SendKDMEmailJob (
+SendKDMEmailJob::SendKDMEmailJob(
 	list<list<KDMWithMetadataPtr>> kdms,
 	dcp::NameFormat container_name_format,
 	dcp::NameFormat filename_format,
 	string cpl_name,
 	vector<string> extra_addresses
 	)
-	: Job (shared_ptr<Film>())
-	, _container_name_format (container_name_format)
-	, _filename_format (filename_format)
-	, _cpl_name (cpl_name)
-	, _kdms (kdms)
-	, _extra_addresses (extra_addresses)
+	: Job({})
+	, _container_name_format(container_name_format)
+	, _filename_format(filename_format)
+	, _cpl_name(cpl_name)
+	, _kdms(kdms)
+	, _extra_addresses(extra_addresses)
 {
 
 }
 
 
-SendKDMEmailJob::~SendKDMEmailJob ()
+SendKDMEmailJob::~SendKDMEmailJob()
 {
-	stop_thread ();
+	stop_thread();
 }
 
 
 string
-SendKDMEmailJob::name () const
+SendKDMEmailJob::name() const
 {
 	auto f = _kdms.front().front()->get('f');
 	if (!f || f->empty()) {
 		return _("Email KDMs");
 	}
 
-	return String::compose (_("Email KDMs for %1"), *f);
+	return String::compose(_("Email KDMs for %1"), *f);
 }
 
 
 string
-SendKDMEmailJob::json_name () const
+SendKDMEmailJob::json_name() const
 {
 	return N_("send_kdm_email");
 }
 
 
 void
-SendKDMEmailJob::run ()
+SendKDMEmailJob::run()
 {
-	set_progress_unknown ();
-	send_emails (_kdms, _container_name_format, _filename_format, _cpl_name, _extra_addresses);
-	set_progress (1);
-	set_state (FINISHED_OK);
+	set_progress_unknown();
+	send_emails(_kdms, _container_name_format, _filename_format, _cpl_name, _extra_addresses);
+	set_progress(1);
+	set_state(FINISHED_OK);
 }
diff --git a/src/lib/send_kdm_email_job.h b/src/lib/send_kdm_email_job.h
index 621254e0f..d2e443195 100644
--- a/src/lib/send_kdm_email_job.h
+++ b/src/lib/send_kdm_email_job.h
@@ -38,7 +38,7 @@ class Log;
 class SendKDMEmailJob : public Job
 {
 public:
-	SendKDMEmailJob (
+	SendKDMEmailJob(
 		std::list<KDMWithMetadataPtr> kdms,
 		dcp::NameFormat container_name_format,
 		dcp::NameFormat filename_format,
@@ -46,7 +46,7 @@ public:
 		std::vector<std::string> extra_addresses
 		);
 
-	SendKDMEmailJob (
+	SendKDMEmailJob(
 		std::list<std::list<KDMWithMetadataPtr>> kdms,
 		dcp::NameFormat container_name_format,
 		dcp::NameFormat filename_format,
@@ -54,11 +54,11 @@ public:
 		std::vector<std::string> extra_addresses
 		);
 
-	~SendKDMEmailJob ();
+	~SendKDMEmailJob();
 
-	std::string name () const override;
-	std::string json_name () const override;
-	void run () override;
+	std::string name() const override;
+	std::string json_name() const override;
+	void run() override;
 
 private:
 	dcp::NameFormat _container_name_format;