C++11 and whitespace cleanups.

4 files changed, 18 insertions, 16 deletions

diff --git a/test/dcp_decoder_test.cc b/test/dcp_decoder_test.cc
index 66cd402c4..5d4d1e0ca 100644
--- a/test/dcp_decoder_test.cc
+++ b/test/dcp_decoder_test.cc
@@ -25,14 +25,15 @@
  */
 
 
-#include "lib/film.h"
+#include "lib/config.h"
+#include "lib/content_factory.h"
 #include "lib/dcp_content.h"
 #include "lib/dcp_decoder.h"
-#include "lib/content_factory.h"
-#include "lib/player.h"
 #include "lib/examine_content_job.h"
+#include "lib/film.h"
 #include "lib/job_manager.h"
-#include "lib/config.h"
+#include "lib/piece.h"
+#include "lib/player.h"
 #include "test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
diff --git a/test/overlap_video_test.cc b/test/overlap_video_test.cc
index 3c969921d..c23444c4a 100644
--- a/test/overlap_video_test.cc
+++ b/test/overlap_video_test.cc
@@ -23,6 +23,7 @@
 #include "lib/content_factory.h"
 #include "lib/dcpomatic_time.h"
 #include "lib/film.h"
+#include "lib/piece.h"
 #include "lib/player.h"
 #include "lib/video_content.h"
 #include "test.h"
diff --git a/test/reels_test.cc b/test/reels_test.cc
index db974d384..618a5b29b 100644
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -25,27 +25,27 @@
  */
 
 
-#include "lib/film.h"
-#include "lib/ratio.h"
+#include "lib/content_factory.h"
+#include "lib/dcp_content.h"
+#include "lib/dcp_content_type.h"
 #include "lib/ffmpeg_content.h"
+#include "lib/film.h"
 #include "lib/image_content.h"
-#include "lib/dcp_content_type.h"
-#include "lib/dcp_content.h"
-#include "lib/video_content.h"
+#include "lib/ratio.h"
 #include "lib/string_text_file_content.h"
-#include "lib/content_factory.h"
+#include "lib/video_content.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
 
-using std::list;
 using std::cout;
-using std::vector;
-using std::string;
-using std::shared_ptr;
-using std::make_shared;
 using std::function;
+using std::list;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
+using std::vector;
 using namespace dcpomatic;
 
 
diff --git a/test/test.cc b/test/test.cc
index 4ea709c81..89ee7f619 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -369,7 +369,7 @@ rms_error (boost::filesystem::path ref, boost::filesystem::path check)
 	auto check_image = check_proxy.image(Image::Alignment::COMPACT).image;
 
 	BOOST_REQUIRE_EQUAL (ref_image->pixel_format(), check_image->pixel_format());
-	AVPixelFormat const format = ref_image->pixel_format();
+	auto const format = ref_image->pixel_format();
 
 	BOOST_REQUIRE (ref_image->size() == check_image->size());
 	int const width = ref_image->size().width;