C++11 tidying.

1 files changed, 36 insertions, 28 deletions

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 030098920..8da8f061e 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,13 +18,14 @@
 
 */
 
-#include "screen_dialog.h"
-#include "wx_util.h"
+
+#include "dcpomatic_button.h"
+#include "download_certificate_dialog.h"
 #include "file_dialog_wrapper.h"
+#include "screen_dialog.h"
 #include "static_text.h"
-#include "download_certificate_dialog.h"
 #include "table_dialog.h"
-#include "dcpomatic_button.h"
+#include "wx_util.h"
 #include "lib/compose.hpp"
 #include "lib/util.h"
 #include "lib/warnings.h"
@@ -36,6 +37,7 @@ DCPOMATIC_DISABLE_WARNINGS
 DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
+
 using std::string;
 using std::cout;
 using std::vector;
@@ -45,11 +47,6 @@ using boost::bind;
 using namespace boost::placeholders;
 #endif
 
-static string
-column (TrustedDevice d)
-{
-	return d.thumbprint ();
-}
 
 class TrustedDeviceDialog : public TableDialog
 {
@@ -68,7 +65,7 @@ public:
 
 	void load_certificate ()
 	{
-		wxFileDialog* d = new wxFileDialog (this, _("Trusted Device certificate"));
+		auto d = new wxFileDialog (this, _("Trusted Device certificate"));
 		if (d->ShowModal() == wxID_OK) {
 			try {
 				_certificate = dcp::Certificate(dcp::file_to_string(wx_to_std(d->GetPath())));
@@ -87,14 +84,14 @@ public:
 
 	optional<TrustedDevice> get ()
 	{
-		string const t = wx_to_std (_thumbprint->GetValue ());
+		auto const t = wx_to_std (_thumbprint->GetValue());
 		if (_certificate && _certificate->thumbprint() == t) {
 			return TrustedDevice (*_certificate);
 		} else if (t.length() == 28) {
 			return TrustedDevice (t);
 		}
 
-		return optional<TrustedDevice> ();
+		return {};
 	}
 
 private:
@@ -103,6 +100,7 @@ private:
 	boost::optional<dcp::Certificate> _certificate;
 };
 
+
 ScreenDialog::ScreenDialog (
 	wxWindow* parent, wxString title, string name, string notes, optional<dcp::Certificate> recipient, vector<TrustedDevice> trusted_devices
 	)
@@ -110,30 +108,30 @@ ScreenDialog::ScreenDialog (
 	, _recipient (recipient)
 	, _trusted_devices (trusted_devices)
 {
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+	auto overall_sizer = new wxBoxSizer (wxVERTICAL);
 	SetSizer (overall_sizer);
 
 	_sizer = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 	int r = 0;
 
-	add_label_to_sizer (_sizer, this, _("Name"), true, wxGBPosition (r, 0));
+	add_label_to_sizer (_sizer, this, _("Name"), true, wxGBPosition(r, 0));
 	_name = new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (320, -1));
 	_sizer->Add (_name, wxGBPosition (r, 1));
 	++r;
 
-	add_label_to_sizer (_sizer, this, _("Notes"), true, wxGBPosition (r, 0));
-	_notes = new wxTextCtrl (this, wxID_ANY, std_to_wx (notes), wxDefaultPosition, wxSize (320, -1));
-	_sizer->Add (_notes, wxGBPosition (r, 1));
+	add_label_to_sizer (_sizer, this, _("Notes"), true, wxGBPosition(r, 0));
+	_notes = new wxTextCtrl (this, wxID_ANY, std_to_wx(notes), wxDefaultPosition, wxSize(320, -1));
+	_sizer->Add (_notes, wxGBPosition(r, 1));
 	++r;
 
         wxClientDC dc (this);
 	wxFont font = _name->GetFont ();
 	font.SetFamily (wxFONTFAMILY_TELETYPE);
 	dc.SetFont (font);
-        wxSize size = dc.GetTextExtent (wxT ("1234567890123456789012345678"));
+        wxSize size = dc.GetTextExtent (wxT("1234567890123456789012345678"));
         size.SetHeight (-1);
 
-	add_label_to_sizer (_sizer, this, _("Recipient certificate"), true, wxGBPosition (r, 0));
+	add_label_to_sizer (_sizer, this, _("Recipient certificate"), true, wxGBPosition(r, 0));
 	wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 	_recipient_thumbprint = new StaticText (this, wxT (""), wxDefaultPosition, size);
 	_recipient_thumbprint->SetFont (font);
@@ -156,7 +154,9 @@ ScreenDialog::ScreenDialog (
 		columns,
 		bind (&ScreenDialog::trusted_devices, this),
 		bind (&ScreenDialog::set_trusted_devices, this, _1),
-		bind (&column, _1),
+		[] (TrustedDevice const& d, int) {
+			return d.thumbprint();
+		},
 		false
 		);
 
@@ -180,30 +180,34 @@ ScreenDialog::ScreenDialog (
 	setup_sensitivity ();
 }
 
+
 string
 ScreenDialog::name () const
 {
 	return wx_to_std (_name->GetValue());
 }
 
+
 string
 ScreenDialog::notes () const
 {
 	return wx_to_std (_notes->GetValue());
 }
 
+
 optional<dcp::Certificate>
 ScreenDialog::recipient () const
 {
 	return _recipient;
 }
 
+
 void
 ScreenDialog::load_recipient (boost::filesystem::path file)
 {
 	try {
 		/* Load this as a chain, in case it is one, and then pick the leaf certificate */
-		dcp::CertificateChain c (dcp::file_to_string (file));
+		dcp::CertificateChain c (dcp::file_to_string(file));
 		if (c.unordered().empty()) {
 			error_dialog (this, _("Could not read certificate file."));
 			return;
@@ -214,38 +218,42 @@ ScreenDialog::load_recipient (boost::filesystem::path file)
 	}
 }
 
+
 void
 ScreenDialog::get_recipient_from_file ()
 {
-	wxFileDialog* d = new wxFileDialog (this, _("Select Certificate File"));
-	if (d->ShowModal () == wxID_OK) {
-		load_recipient (boost::filesystem::path (wx_to_std (d->GetPath ())));
+	auto d = new wxFileDialog (this, _("Select Certificate File"));
+	if (d->ShowModal() == wxID_OK) {
+		load_recipient (boost::filesystem::path(wx_to_std(d->GetPath())));
 	}
 	d->Destroy ();
 
 	setup_sensitivity ();
 }
 
+
 void
 ScreenDialog::download_recipient ()
 {
-	DownloadCertificateDialog* d = new DownloadCertificateDialog (this);
+	auto d = new DownloadCertificateDialog (this);
 	if (d->ShowModal() == wxID_OK) {
-		set_recipient (d->certificate ());
+		set_recipient (d->certificate());
 	}
 	d->Destroy ();
 	setup_sensitivity ();
 }
 
+
 void
 ScreenDialog::setup_sensitivity ()
 {
-	wxButton* ok = dynamic_cast<wxButton*> (FindWindowById (wxID_OK, this));
+	auto ok = dynamic_cast<wxButton*> (FindWindowById(wxID_OK, this));
 	if (ok) {
 		ok->Enable (static_cast<bool>(_recipient) && !_name->GetValue().IsEmpty());
 	}
 }
 
+
 void
 ScreenDialog::set_recipient (optional<dcp::Certificate> r)
 {