C++11 tidying.

6 files changed, 46 insertions, 25 deletions

diff --git a/test/audio_merger_test.cc b/test/audio_merger_test.cc
index 4472f02c1..3a677bf82 100644
--- a/test/audio_merger_test.cc
+++ b/test/audio_merger_test.cc
@@ -33,7 +33,6 @@
 #include <dcp/raw_convert.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/bind/bind.hpp>
-#include <boost/function.hpp>
 #include <boost/signals2.hpp>
 #include <iostream>
 
diff --git a/test/data b/test/data
-Subproject 3596fb230c71b820ee5ced44d08d76a4ca3821d
+Subproject 1ba6c3a1d4b3b507ef868aaacf9fa0383a7f22a
diff --git a/test/ffmpeg_examiner_test.cc b/test/ffmpeg_examiner_test.cc
index 9c3311719..73e73cbad 100644
--- a/test/ffmpeg_examiner_test.cc
+++ b/test/ffmpeg_examiner_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,42 +18,48 @@
 
 */
 
+
 /** @file  test/ffmpeg_examiner_test.cc
  *  @brief FFmpegExaminer tests
  *  @ingroup selfcontained
  */
 
+
 #include <boost/test/unit_test.hpp>
 #include "lib/ffmpeg_examiner.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_audio_stream.h"
 #include "test.h"
 
+
+using std::make_shared;
 using std::shared_ptr;
 using namespace dcpomatic;
 
+
 /** Check that the FFmpegExaminer can extract the first video and audio time
  *  correctly from data/count300bd24.m2ts.
  */
 BOOST_AUTO_TEST_CASE (ffmpeg_examiner_test)
 {
-	shared_ptr<Film> film = new_test_film ("ffmpeg_examiner_test");
-	shared_ptr<FFmpegContent> content (new FFmpegContent ("test/data/count300bd24.m2ts"));
-	shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (content));
+	auto film = new_test_film ("ffmpeg_examiner_test");
+	auto content = make_shared<FFmpegContent>("test/data/count300bd24.m2ts");
+	auto examiner = make_shared<FFmpegExaminer>(content);
 
 	BOOST_CHECK_EQUAL (examiner->first_video().get().get(), ContentTime::from_seconds(600).get());
 	BOOST_CHECK_EQUAL (examiner->audio_streams().size(), 1U);
 	BOOST_CHECK_EQUAL (examiner->audio_streams()[0]->first_audio.get().get(), ContentTime::from_seconds(600).get());
 }
 
+
 /** Check that audio sampling rate and channel counts are correctly picked up from
  *  a problematic file.  When we used to specify analyzeduration and probesize
  *  this file's details were picked up incorrectly.
  */
 BOOST_AUTO_TEST_CASE (ffmpeg_examiner_probesize_test)
 {
-	shared_ptr<FFmpegContent> content (new FFmpegContent(TestPaths::private_data() / "RockyTop10 Playlist Flat.m4v"));
-	shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer(content));
+	auto content = make_shared<FFmpegContent>(TestPaths::private_data() / "RockyTop10 Playlist Flat.m4v");
+	auto examiner = make_shared<FFmpegExaminer>(content);
 
 	BOOST_CHECK_EQUAL (examiner->audio_streams().size(), 2U);
 	BOOST_CHECK_EQUAL (examiner->audio_streams()[0]->frame_rate(), 48000);
diff --git a/test/reels_test.cc b/test/reels_test.cc
index a37e14067..5bb119f46 100644
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -45,7 +45,7 @@ using std::vector;
 using std::string;
 using std::shared_ptr;
 using std::make_shared;
-using boost::function;
+using std::function;
 using namespace dcpomatic;
 
 
diff --git a/test/required_disk_space_test.cc b/test/required_disk_space_test.cc
index 5510864d9..cad2e2ee5 100644
--- a/test/required_disk_space_test.cc
+++ b/test/required_disk_space_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,20 +18,24 @@
 
 */
 
+
 /** @file  test/required_disk_space_test.cc
  *  @brief Check Film::required_disk_space
  *  @ingroup selfcontained
  */
 
+
 #include "lib/content_factory.h"
 #include "lib/dcp_content.h"
 #include "lib/film.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
+
+using std::dynamic_pointer_cast;
 using std::make_shared;
 using std::shared_ptr;
-using std::dynamic_pointer_cast;
+
 
 void check_within_n (int64_t a, int64_t b, int64_t n)
 {
diff --git a/test/util_test.cc b/test/util_test.cc
index a46337ab7..67c1a5265 100644
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,11 +18,13 @@
 
 */
 
+
 /** @file  test/util_test.cc
  *  @brief Test various utility methods.
  *  @ingroup selfcontained
  */
 
+
 #include "lib/util.h"
 #include "lib/cross.h"
 #include "lib/exceptions.h"
@@ -31,15 +33,17 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/bind/bind.hpp>
 
-using std::string;
-using std::vector;
+
 using std::list;
 using std::shared_ptr;
+using std::string;
+using std::vector;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
 using namespace dcpomatic;
 
+
 BOOST_AUTO_TEST_CASE (digest_head_tail_test)
 {
 	vector<boost::filesystem::path> p;
@@ -61,27 +65,30 @@ BOOST_AUTO_TEST_CASE (digest_head_tail_test)
 	BOOST_CHECK_THROW (digest_head_tail (p, 1024), OpenFileError);
 }
 
+
 BOOST_AUTO_TEST_CASE (timecode_test)
 {
-	DCPTime t = DCPTime::from_seconds (2 * 60 * 60 + 4 * 60 + 31) + DCPTime::from_frames (19, 24);
+	auto t = DCPTime::from_seconds (2 * 60 * 60 + 4 * 60 + 31) + DCPTime::from_frames (19, 24);
 	BOOST_CHECK_EQUAL (t.timecode (24), "02:04:31:19");
 }
 
+
 BOOST_AUTO_TEST_CASE (seconds_to_approximate_hms_test)
 {
-	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (1), "1s");
-	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (2), "2s");
-	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (60), "1m");
-	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (1.5 * 60), "1m 30s");
-	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (2 * 60), "2m");
-	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (17 * 60 + 20), "17m");
-	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (1 * 3600), "1h");
-	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (3600 + 40 * 60), "1h 40m");
-	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (2 * 3600), "2h");
-	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (2 * 3600 - 1), "2h");
-	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (13 * 3600 + 40 * 60), "14h");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms(1), "1s");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms(2), "2s");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms(60), "1m");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms(1.5 * 60), "1m 30s");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms(2 * 60), "2m");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms(17 * 60 + 20), "17m");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms(1 * 3600), "1h");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms(3600 + 40 * 60), "1h 40m");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms(2 * 3600), "2h");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms(2 * 3600 - 1), "2h");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms(13 * 3600 + 40 * 60), "14h");
 }
 
+
 BOOST_AUTO_TEST_CASE (time_to_hmsf_test)
 {
 	BOOST_CHECK_EQUAL (time_to_hmsf(DCPTime::from_frames(12, 24), 24), "0:00:00.12");
@@ -91,6 +98,7 @@ BOOST_AUTO_TEST_CASE (time_to_hmsf_test)
 	BOOST_CHECK_EQUAL (time_to_hmsf(DCPTime::from_seconds(2 * 60 * 60 + 92), 24), "2:01:32.0");
 }
 
+
 BOOST_AUTO_TEST_CASE (tidy_for_filename_test)
 {
 	BOOST_CHECK_EQUAL (tidy_for_filename ("fish\\chips"), "fish_chips");
@@ -99,6 +107,7 @@ BOOST_AUTO_TEST_CASE (tidy_for_filename_test)
 	BOOST_CHECK_EQUAL (tidy_for_filename ("abcdefghï"), "abcdefghï");
 }
 
+
 BOOST_AUTO_TEST_CASE (utf8_strlen_test)
 {
 	BOOST_CHECK_EQUAL (utf8_strlen("hello world"), 11U);
@@ -106,6 +115,7 @@ BOOST_AUTO_TEST_CASE (utf8_strlen_test)
 	BOOST_CHECK_EQUAL (utf8_strlen("hëłlo wørld"), 11U);
 }
 
+
 BOOST_AUTO_TEST_CASE (careful_string_filter_test)
 {
 	BOOST_CHECK_EQUAL ("hello_world", careful_string_filter("hello_world"));
@@ -116,6 +126,7 @@ BOOST_AUTO_TEST_CASE (careful_string_filter_test)
 	BOOST_CHECK_EQUAL ("hello_world_CcGgIOoSsUu", careful_string_filter("hello_world_ÇçĞğİÖöŞşÜü"));
 }
 
+
 static list<float> progress_values;
 
 static void
@@ -124,6 +135,7 @@ progress (float p)
 	progress_values.push_back (p);
 }
 
+
 BOOST_AUTO_TEST_CASE (copy_in_bits_test)
 {
 	for (int i = 0; i < 32; ++i) {