C++11 and whitespace cleanups.

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index df3d9ed1c0abdb2f89040308baeefd1c2ff97034..bcf3b9c76cac1a90df009bfffc8468930aa06634 100644 (file)
--- 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 f2ec68bddd8786a9a73f6258dc8d757c8600b50b..b1d278893b51c6b1f003bace8880e4210b4626c6 100644 (file)
--- 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 2dbb45581b59352c6154b9bfb3ac25d9e53d95a4..05896dc0777e97d5234d6d36643ee2e47d0ad92c 100644 (file)
--- 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 41ddd90d298be4d04df810e738e7a0ec14804fee..0779f299e6e6b77400c8a5dd3ea0bdf41cc11c7b 100644 (file)
--- 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);