C++11 tidying.

1 files changed, 32 insertions, 26 deletions

diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index 6aa0d878f..8a2757557 100644
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2022 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,16 +18,17 @@
 
 */
 
-#include "kdm_output_panel.h"
-#include "kdm_timing_panel.h"
+
+#include "check_box.h"
 #include "confirm_kdm_email_dialog.h"
-#include "wx_util.h"
+#include "dcpomatic_button.h"
 #include "kdm_advanced_dialog.h"
+#include "kdm_output_panel.h"
+#include "kdm_timing_panel.h"
 #include "name_format_editor.h"
-#include "check_box.h"
-#include "dcpomatic_button.h"
-#include "lib/config.h"
+#include "wx_util.h"
 #include "lib/cinema.h"
+#include "lib/config.h"
 #include "lib/send_kdm_email_job.h"
 #include "lib/warnings.h"
 #include <dcp/exceptions.h>
@@ -43,13 +44,14 @@ DCPOMATIC_DISABLE_WARNINGS
 #include <wx/stdpaths.h>
 DCPOMATIC_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 std::function;
+using std::string;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
@@ -61,12 +63,12 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent)
 	, _forensic_mark_audio (true)
 	, _forensic_mark_audio_up_to (12)
 {
-	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0);
+	auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0);
 	table->AddGrowableCol (1);
 
 	add_label_to_sizer (table, this, _("KDM type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 
-	wxBoxSizer* type = new wxBoxSizer (wxHORIZONTAL);
+	auto type = new wxBoxSizer (wxHORIZONTAL);
 	_type = new wxChoice (this, wxID_ANY);
 	_type->Append ("Modified Transitional 1", ((void *) dcp::Formulation::MODIFIED_TRANSITIONAL_1));
 	_type->Append ("DCI Any", ((void *) dcp::Formulation::DCI_ANY));
@@ -75,7 +77,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent)
 	_type->Append ("Modified Transitional 1 (without AuthorizedDeviceInfo)", ((void *) dcp::Formulation::MODIFIED_TRANSITIONAL_TEST));
 	type->Add (_type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD);
 	_type->SetSelection (0);
-	wxButton* advanced = new Button (this, _("Advanced..."));
+	auto advanced = new Button (this, _("Advanced..."));
 	type->Add (advanced, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
 	table->Add (type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD);
 
@@ -116,7 +118,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent)
 	_folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));
 #endif
 
-	boost::optional<boost::filesystem::path> path = Config::instance()->default_kdm_directory ();
+	auto path = Config::instance()->default_kdm_directory ();
 	if (path) {
 		_folder->SetPath (std_to_wx (path->string ()));
 	} else {
@@ -125,7 +127,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent)
 
 	table->Add (_folder, 1, wxEXPAND);
 
-	wxSizer* write_options = new wxBoxSizer(wxVERTICAL);
+	auto write_options = new wxBoxSizer(wxVERTICAL);
 	_write_flat = new wxRadioButton (this, wxID_ANY, _("Write all KDMs to the same folder"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
 	write_options->Add (_write_flat, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
 	_write_folder = new wxRadioButton (this, wxID_ANY, _("Write a folder for each cinema's KDMs"));
@@ -163,6 +165,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent)
 	SetSizer (table);
 }
 
+
 void
 KDMOutputPanel::setup_sensitivity ()
 {
@@ -173,10 +176,11 @@ KDMOutputPanel::setup_sensitivity ()
 	_write_zip->Enable (write);
 }
 
+
 void
 KDMOutputPanel::advanced_clicked ()
 {
-	KDMAdvancedDialog* d = new KDMAdvancedDialog (this, _forensic_mark_video, _forensic_mark_audio, _forensic_mark_audio_up_to);
+	auto d = new KDMAdvancedDialog (this, _forensic_mark_video, _forensic_mark_audio, _forensic_mark_audio_up_to);
 	d->ShowModal ();
 	_forensic_mark_video = d->forensic_mark_video ();
 	_forensic_mark_audio = d->forensic_mark_audio ();
@@ -184,6 +188,7 @@ KDMOutputPanel::advanced_clicked ()
 	d->Destroy ();
 }
 
+
 void
 KDMOutputPanel::kdm_write_type_changed ()
 {
@@ -196,12 +201,13 @@ KDMOutputPanel::kdm_write_type_changed ()
 	}
 }
 
+
 pair<shared_ptr<Job>, int>
 KDMOutputPanel::make (
 	list<KDMWithMetadataPtr> kdms, string name, function<bool (boost::filesystem::path)> confirm_overwrite
 	)
 {
-	list<list<KDMWithMetadataPtr> > const cinema_kdms = collect (kdms);
+	auto const cinema_kdms = collect (kdms);
 
 	/* Decide whether to proceed */
 
@@ -214,12 +220,10 @@ KDMOutputPanel::make (
 			error_dialog (this, _("You must set up a mail server in Preferences before you can send emails."));
 		}
 
-		bool cinemas_with_no_email = false;
-		for (auto i: cinema_kdms) {
-			if (i.front()->emails().empty()) {
-				cinemas_with_no_email = true;
-			}
-		}
+		bool const cinemas_with_no_email = std::any_of(
+			cinema_kdms.begin(), cinema_kdms.end(),
+			[](list<KDMWithMetadataPtr> const& list) { return list.front()->emails().empty(); }
+			);
 
 		if (proceed && cinemas_with_no_email && !confirm_dialog (
 			    this,
@@ -237,7 +241,7 @@ KDMOutputPanel::make (
 			}
 
 			if (!emails.empty ()) {
-				ConfirmKDMEmailDialog* d = new ConfirmKDMEmailDialog (this, emails);
+				auto d = new ConfirmKDMEmailDialog (this, emails);
 				if (d->ShowModal() == wxID_CANCEL) {
 					proceed = false;
 				}
@@ -246,7 +250,7 @@ KDMOutputPanel::make (
 	}
 
 	if (!proceed) {
-		return make_pair (shared_ptr<Job>(), 0);
+		return {};
 	}
 
 	Config::instance()->set_kdm_filename_format (_filename_format->get ());
@@ -305,12 +309,14 @@ KDMOutputPanel::make (
 	return make_pair (job, written);
 }
 
+
 dcp::Formulation
 KDMOutputPanel::formulation () const
 {
 	return (dcp::Formulation) reinterpret_cast<intptr_t> (_type->GetClientData (_type->GetSelection()));
 }
 
+
 boost::filesystem::path
 KDMOutputPanel::directory () const
 {