From a6fa1fb06fb6db8891c583260334870ef7c9d8c7 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 3 Apr 2022 00:04:31 +0200
Subject: [PATCH] C++11 and whitespace cleanups.

---
 src/lib/dcp_decoder.cc     | 9 ++++-----
 src/lib/dcp_examiner.cc    | 1 -
 src/lib/image_content.cc   | 1 +
 src/wx/recipient_dialog.cc | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index df3d9ed1c..bcf3b9c76 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -55,15 +55,14 @@
 
 #include "i18n.h"
 
-
-using std::list;
 using std::cout;
+using std::dynamic_pointer_cast;
+using std::list;
+using std::make_shared;
 using std::map;
+using std::shared_ptr;
 using std::string;
 using std::vector;
-using std::shared_ptr;
-using std::dynamic_pointer_cast;
-using std::make_shared;
 using boost::optional;
 using namespace dcpomatic;
 
diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index f2ec68bdd..b1d278893 100644
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -41,7 +41,6 @@
 #include <dcp/reel_subtitle_asset.h>
 #include <dcp/search.h>
 #include <dcp/sound_asset.h>
-#include <dcp/sound_asset.h>
 #include <dcp/sound_asset_reader.h>
 #include <dcp/stereo_picture_asset.h>
 #include <dcp/stereo_picture_asset_reader.h>
diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 2dbb45581..05896dc07 100644
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -19,6 +19,7 @@
 
 */
 
+
 #include "compose.hpp"
 #include "exceptions.h"
 #include "film.h"
diff --git a/src/wx/recipient_dialog.cc b/src/wx/recipient_dialog.cc
index 41ddd90d2..0779f299e 100644
--- a/src/wx/recipient_dialog.cc
+++ b/src/wx/recipient_dialog.cc
@@ -100,8 +100,8 @@ RecipientDialog::RecipientDialog (
 	auto font = _name->GetFont ();
 	font.SetFamily (wxFONTFAMILY_TELETYPE);
 	dc.SetFont (font);
-        wxSize size = dc.GetTextExtent (wxT ("1234567890123456789012345678"));
-        size.SetHeight (-1);
+	auto size = dc.GetTextExtent(wxT("1234567890123456789012345678"));
+	size.SetHeight (-1);
 
 	add_label_to_sizer (_sizer, this, _("Recipient certificate"), true, wxGBPosition (r, 0));
 	auto s = new wxBoxSizer (wxHORIZONTAL);
-- 
2.30.2