Cleanup: replace some list with vector.

3 files changed, 8 insertions, 9 deletions

diff --git a/test/config_test.cc b/test/config_test.cc
index e90550085..103a6a585 100644
--- a/test/config_test.cc
+++ b/test/config_test.cc
@@ -26,10 +26,10 @@
 #include <fstream>
 
 
-using std::list;
-using std::ofstream;
 using std::make_shared;
+using std::ofstream;
 using std::string;
+using std::vector;
 using boost::optional;
 
 
@@ -206,7 +206,7 @@ BOOST_AUTO_TEST_CASE (config_keep_cinemas_if_making_new_config)
 
 	Config::instance()->write();
 
-	Config::instance()->add_cinema(make_shared<Cinema>("My Great Cinema", list<string>(), "", 0, 0));
+	Config::instance()->add_cinema(make_shared<Cinema>("My Great Cinema", vector<string>(), "", 0, 0));
 	Config::instance()->write();
 
 	boost::filesystem::copy_file (dir / "cinemas.xml", dir / "backup_for_test.xml");
diff --git a/test/kdm_cli_test.cc b/test/kdm_cli_test.cc
index e300d82a5..c91cb64f4 100644
--- a/test/kdm_cli_test.cc
+++ b/test/kdm_cli_test.cc
@@ -31,7 +31,6 @@
 #include <iostream>
 
 
-using std::list;
 using std::string;
 using std::vector;
 using boost::optional;
@@ -86,13 +85,13 @@ setup_test_config()
 	auto config = Config::instance();
 	auto const cert = dcp::Certificate(dcp::file_to_string("test/data/cert.pem"));
 
-	auto cinema_a = std::make_shared<Cinema>("Dean's Screens", list<string>(), "", 0, 0);
+	auto cinema_a = std::make_shared<Cinema>("Dean's Screens", vector<string>(), "", 0, 0);
 	cinema_a->add_screen(std::make_shared<dcpomatic::Screen>("Screen 1", "", cert, boost::none, std::vector<TrustedDevice>()));
 	cinema_a->add_screen(std::make_shared<dcpomatic::Screen>("Screen 2", "", cert, boost::none, std::vector<TrustedDevice>()));
 	cinema_a->add_screen(std::make_shared<dcpomatic::Screen>("Screen 3", "", cert, boost::none, std::vector<TrustedDevice>()));
 	config->add_cinema(cinema_a);
 
-	auto cinema_b = std::make_shared<Cinema>("Floyd's Celluloid", list<string>(), "", 0, 0);
+	auto cinema_b = std::make_shared<Cinema>("Floyd's Celluloid", vector<string>(), "", 0, 0);
 	cinema_b->add_screen(std::make_shared<dcpomatic::Screen>("Foo", "", cert, boost::none, std::vector<TrustedDevice>()));
 	cinema_b->add_screen(std::make_shared<dcpomatic::Screen>("Bar", "", cert, boost::none, std::vector<TrustedDevice>()));
 	config->add_cinema(cinema_b);
diff --git a/test/kdm_naming_test.cc b/test/kdm_naming_test.cc
index 30356afbf..32500553e 100644
--- a/test/kdm_naming_test.cc
+++ b/test/kdm_naming_test.cc
@@ -60,7 +60,7 @@ BOOST_AUTO_TEST_CASE (single_kdm_naming_test)
 	auto crypt_cert = c->decryption_chain()->leaf();
 
 	/* Cinema A: UTC +4:30 */
-	auto cinema_a = make_shared<Cinema>("Cinema A", list<string>(), "", 4, 30);
+	auto cinema_a = make_shared<Cinema>("Cinema A", vector<string>(), "", 4, 30);
 	cinema_a_screen_1 = std::make_shared<dcpomatic::Screen>("Screen 1", "", crypt_cert, boost::none, vector<TrustedDevice>());
 	cinema_a->add_screen (cinema_a_screen_1);
 	cinema_a_screen_2 = std::make_shared<dcpomatic::Screen>("Screen 2", "", crypt_cert, boost::none, vector<TrustedDevice>());
@@ -68,7 +68,7 @@ BOOST_AUTO_TEST_CASE (single_kdm_naming_test)
 	c->add_cinema (cinema_a);
 
 	/* Cinema B: UTC -1:00 */
-	auto cinema_b = make_shared<Cinema>("Cinema B", list<string>(), "", -1, 0);
+	auto cinema_b = make_shared<Cinema>("Cinema B", vector<string>(), "", -1, 0);
 	cinema_b_screen_x = std::make_shared<dcpomatic::Screen>("Screen X", "", crypt_cert, boost::none, vector<TrustedDevice>());
 	cinema_b->add_screen (cinema_b_screen_x);
 	cinema_b_screen_y = std::make_shared<dcpomatic::Screen>("Screen Y", "", crypt_cert, boost::none, vector<TrustedDevice>());
@@ -160,7 +160,7 @@ BOOST_AUTO_TEST_CASE (directory_kdm_naming_test, * boost::unit_test::depends_on(
 	string const from_string = from.date() + " " + from.time_of_day(true, false);
 	string const until_string = until.date() + " " + until.time_of_day(true, false);
 
-	list<shared_ptr<dcpomatic::Screen>> screens = {
+	vector<shared_ptr<dcpomatic::Screen>> screens = {
 		cinema_a_screen_2, cinema_b_screen_x, cinema_a_screen_1, (cinema_b_screen_z)
 	};