C++11 tidying.

1 files changed, 27 insertions, 26 deletions

diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc
index 886c1c613..566ec82f1 100644
--- a/src/tools/dcpomatic_combiner.cc
+++ b/src/tools/dcpomatic_combiner.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -37,12 +37,13 @@ DCPOMATIC_ENABLE_WARNINGS
 #include <exception>
 
 
+using std::dynamic_pointer_cast;
 using std::exception;
+using std::make_shared;
+using std::shared_ptr;
 using std::string;
 using std::vector;
-using std::dynamic_pointer_cast;
 using boost::optional;
-using std::shared_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
@@ -80,13 +81,13 @@ class DOMFrame : public wxFrame
 {
 public:
 	explicit DOMFrame (wxString const & title)
-		: wxFrame (0, -1, title)
+		: wxFrame (nullptr, -1, title)
 	{
 		/* Use a panel as the only child of the Frame so that we avoid
 		   the dark-grey background on Windows.
 		*/
-		wxPanel* overall_panel = new wxPanel (this);
-		wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+		auto overall_panel = new wxPanel (this);
+		auto s = new wxBoxSizer (wxHORIZONTAL);
 		s->Add (overall_panel, 1, wxEXPAND);
 		SetSizer (s);
 
@@ -103,14 +104,14 @@ public:
 			true
 			);
 
-		wxBoxSizer* output = new wxBoxSizer (wxHORIZONTAL);
+		auto output = new wxBoxSizer (wxHORIZONTAL);
 		add_label_to_sizer (output, overall_panel, _("Output DCP folder"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_output = new DirPickerCtrl (overall_panel);
 		output->Add (_output, 1, wxEXPAND);
 
 		_combine = new Button (overall_panel, _("Combine"));
 
-		wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+		auto sizer = new wxBoxSizer (wxVERTICAL);
 		sizer->Add (_input, 1, wxALL | wxEXPAND, DCPOMATIC_DIALOG_BORDER);
 		sizer->Add (output, 0, wxALL | wxEXPAND, DCPOMATIC_DIALOG_BORDER);
 		sizer->Add (_combine, 0, wxALL | wxALIGN_RIGHT, DCPOMATIC_DIALOG_BORDER);
@@ -137,9 +138,11 @@ private:
 
 	void combine ()
 	{
-		boost::filesystem::path const output = wx_to_std(_output->GetPath());
+		using namespace boost::filesystem;
+
+		path const output = wx_to_std(_output->GetPath());
 
-		if (boost::filesystem::is_directory(output) && !boost::filesystem::is_empty(output)) {
+		if (is_directory(output) && !is_empty(output)) {
 			if (!confirm_dialog (
 				    this,
 				    std_to_wx (
@@ -150,7 +153,7 @@ private:
 				    )) {
 				return;
 			}
-		} else if (boost::filesystem::is_regular_file(output)) {
+		} else if (is_regular_file(output)) {
 			error_dialog (
 				this,
 				String::compose (wx_to_std(_("%1 already exists as a file, so you cannot use it for a DCP.")), output.string())
@@ -158,21 +161,21 @@ private:
 			return;
 		}
 
-		JobManager* jm = JobManager::instance ();
-		jm->add (shared_ptr<Job>(new CombineDCPJob(_inputs, output)));
+		auto jm = JobManager::instance ();
+		jm->add (make_shared<CombineDCPJob>(_inputs, output));
 		bool const ok = display_progress (_("DCP-o-matic Combine"), _("Combining DCPs"));
 		if (!ok) {
 			return;
 		}
 
 		DCPOMATIC_ASSERT (!jm->get().empty());
-		shared_ptr<CombineDCPJob> last = dynamic_pointer_cast<CombineDCPJob> (jm->get().back());
+		auto last = dynamic_pointer_cast<CombineDCPJob> (jm->get().back());
 		DCPOMATIC_ASSERT (last);
 
 		if (last->finished_ok()) {
 			message_dialog (this, _("DCPs combined successfully."));
 		} else {
-			wxString m = std_to_wx(last->error_summary());
+			auto m = std_to_wx(last->error_summary());
 			if (!last->error_details().empty()) {
 				m += wxString::Format(" (%s)", std_to_wx(last->error_details()));
 			}
@@ -195,11 +198,9 @@ private:
 class App : public wxApp
 {
 public:
-	App ()
-		: _frame (0)
-	{}
+	App () {}
 
-	bool OnInit ()
+	bool OnInit () override
 	{
 		try {
 			Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
@@ -249,7 +250,7 @@ public:
 		}
 		catch (exception& e)
 		{
-			error_dialog (0, wxString::Format ("DCP-o-matic DCP Combiner could not start."), std_to_wx(e.what()));
+			error_dialog (nullptr, wxString::Format ("DCP-o-matic DCP Combiner could not start."), std_to_wx(e.what()));
 			return false;
 		}
 
@@ -279,7 +280,7 @@ public:
 		} catch (FileError& e) {
 			error_dialog (
 				0,
-				wxString::Format (
+				wxString::Format(
 					_("An exception occurred: %s (%s)\n\n") + REPORT_PROBLEM,
 					std_to_wx (e.what()),
 					std_to_wx (e.file().string().c_str ())
@@ -288,29 +289,29 @@ public:
 		} catch (exception& e) {
 			error_dialog (
 				0,
-				wxString::Format (
+				wxString::Format(
 					_("An exception occurred: %s.\n\n") + REPORT_PROBLEM,
 					std_to_wx (e.what ())
 					)
 				);
 		} catch (...) {
-			error_dialog (0, _("An unknown exception occurred.") + "  " + REPORT_PROBLEM);
+			error_dialog (nullptr, _("An unknown exception occurred.") + "  " + REPORT_PROBLEM);
 		}
 	}
 
-	bool OnExceptionInMainLoop ()
+	bool OnExceptionInMainLoop () override
 	{
 		report_exception ();
 		/* This will terminate the program */
 		return false;
 	}
 
-	void OnUnhandledException ()
+	void OnUnhandledException () override
 	{
 		report_exception ();
 	}
 
-	DOMFrame* _frame;
+	DOMFrame* _frame = nullptr;
 };
 
 IMPLEMENT_APP (App)