Replace list with vector in most of the API.

7 files changed, 100 insertions, 103 deletions

diff --git a/test/dcp_reader_test.cc b/test/dcp_reader_test.cc
index e6a53e6..9105c28 100644
--- a/test/dcp_reader_test.cc
+++ b/test/dcp_reader_test.cc
@@ -22,24 +22,24 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/optional/optional_io.hpp>
 
-using std::list;
 using std::shared_ptr;
+using std::vector;
 
 /* Test reading of a DCP XML file */
 BOOST_AUTO_TEST_CASE (dcp_reader_test1)
 {
 	sub::DCPReader reader ("test/data/test1.xml");
-	list<sub::Subtitle> subs = sub::collect<list<sub::Subtitle> > (reader.subtitles ());
+	auto subs = sub::collect<vector<sub::Subtitle>> (reader.subtitles());
 
-	list<sub::Subtitle>::iterator i = subs.begin ();
-	BOOST_REQUIRE (i != subs.end ());
+	auto i = subs.begin();
+	BOOST_REQUIRE (i != subs.end());
 	BOOST_CHECK_EQUAL (i->from, sub::Time::from_hms (0, 0, 5, 198 * 4));
 	BOOST_CHECK_EQUAL (i->to, sub::Time::from_hms (0, 0, 7, 115 * 4));
 	BOOST_CHECK_EQUAL (i->fade_up.get(), sub::Time::from_hms (0, 0, 0, 4));
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 4));
 
 	{
-		list<sub::Line>::iterator j = i->lines.begin ();
+		auto j = i->lines.begin();
 		BOOST_REQUIRE (j != i->lines.end ());
 		BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
 		sub::Block b = j->blocks.front ();
@@ -65,10 +65,10 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test1)
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 4));
 
 	{
-		list<sub::Line>::iterator j = i->lines.begin ();
+		auto j = i->lines.begin();
 		BOOST_REQUIRE (j != i->lines.end ());
 		BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
-		sub::Block b = j->blocks.front ();
+		auto b = j->blocks.front ();
 		BOOST_CHECK_EQUAL (b.font.get(), "theFontId");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
@@ -105,10 +105,10 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test1)
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 4));
 
 	{
-		list<sub::Line>::iterator j = i->lines.begin ();
+		auto j = i->lines.begin();
 		BOOST_REQUIRE (j != i->lines.end ());
 		BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
-		sub::Block b = j->blocks.front ();
+		auto b = j->blocks.front();
 		BOOST_CHECK_EQUAL (b.font.get(), "theFontId");
 		BOOST_CHECK_EQUAL (b.italic, false);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
@@ -131,10 +131,10 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test1)
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 4));
 
 	{
-		list<sub::Line>::iterator j = i->lines.begin ();
+		auto j = i->lines.begin();
 		BOOST_REQUIRE (j != i->lines.end ());
 		BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
-		sub::Block b = j->blocks.front ();
+		auto b = j->blocks.front();
 		BOOST_CHECK_EQUAL (b.font.get(), "theFontId");
 		BOOST_CHECK_EQUAL (b.italic, false);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
@@ -154,9 +154,9 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test1)
 BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 {
 	sub::DCPReader reader ("test/data/test2.xml");
-	list<sub::Subtitle> subs = sub::collect<list<sub::Subtitle> > (reader.subtitles ());
+	auto subs = sub::collect<vector<sub::Subtitle>> (reader.subtitles ());
 
-	list<sub::Subtitle>::iterator i = subs.begin ();
+	auto i = subs.begin ();
 	BOOST_REQUIRE (i != subs.end ());
 	BOOST_CHECK_EQUAL (i->from, sub::Time::from_hms (0, 0, 41, 62 * 4));
 	BOOST_CHECK_EQUAL (i->to, sub::Time::from_hms (0, 0, 43, 52 * 4));
@@ -164,10 +164,10 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));
 
 	{
-		list<sub::Line>::iterator j = i->lines.begin ();
+		auto j = i->lines.begin ();
 		BOOST_REQUIRE (j != i->lines.end ());
 		BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
-		sub::Block b = j->blocks.front ();
+		auto b = j->blocks.front ();
 		BOOST_CHECK_EQUAL (b.font.get(), "theFont");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
@@ -204,10 +204,10 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));
 
 	{
-		list<sub::Line>::iterator j = i->lines.begin ();
+		auto j = i->lines.begin ();
 		BOOST_REQUIRE (j != i->lines.end ());
 		BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
-		sub::Block b = j->blocks.front ();
+		auto b = j->blocks.front ();
 		BOOST_CHECK_EQUAL (b.font.get(), "theFont");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
@@ -244,10 +244,10 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));
 
 	{
-		list<sub::Line>::iterator j = i->lines.begin ();
+		auto j = i->lines.begin();
 		BOOST_REQUIRE (j != i->lines.end ());
 		BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
-		sub::Block b = j->blocks.front ();
+		auto b = j->blocks.front();
 		BOOST_CHECK_EQUAL (b.font.get(), "theFont");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
@@ -288,10 +288,10 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));
 
 	{
-		list<sub::Line>::iterator j = i->lines.begin ();
+		auto j = i->lines.begin();
 		BOOST_REQUIRE (j != i->lines.end ());
 		BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
-		sub::Block b = j->blocks.front ();
+		auto b = j->blocks.front();
 		BOOST_CHECK_EQUAL (b.font.get(), "theFont");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
@@ -328,10 +328,10 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));
 
 	{
-		list<sub::Line>::iterator j = i->lines.begin ();
+		auto j = i->lines.begin();
 		BOOST_REQUIRE (j != i->lines.end ());
 		BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
-		sub::Block b = j->blocks.front ();
+		auto b = j->blocks.front();
 		BOOST_CHECK_EQUAL (b.font.get(), "theFont");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
@@ -368,10 +368,10 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));
 
 	{
-		list<sub::Line>::iterator j = i->lines.begin ();
+		auto j = i->lines.begin();
 		BOOST_REQUIRE (j != i->lines.end ());
 		BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
-		sub::Block b = j->blocks.front ();
+		auto b = j->blocks.front();
 		BOOST_CHECK_EQUAL (b.font.get(), "theFont");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
@@ -408,10 +408,10 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));
 
 	{
-		list<sub::Line>::iterator j = i->lines.begin ();
+		auto j = i->lines.begin();
 		BOOST_REQUIRE (j != i->lines.end ());
 		BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
-		sub::Block b = j->blocks.front ();
+		auto b = j->blocks.front();
 		BOOST_CHECK_EQUAL (b.font.get(), "theFont");
 		BOOST_CHECK_EQUAL (b.italic, false);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
@@ -448,10 +448,10 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));
 
 	{
-		list<sub::Line>::iterator j = i->lines.begin ();
+		auto j = i->lines.begin();
 		BOOST_REQUIRE (j != i->lines.end ());
 		BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
-		sub::Block b = j->blocks.front ();
+		auto b = j->blocks.front();
 		BOOST_CHECK_EQUAL (b.font.get(), "theFont");
 		BOOST_CHECK_EQUAL (b.italic, false);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
@@ -488,10 +488,10 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));
 
 	{
-		list<sub::Line>::iterator j = i->lines.begin ();
+		auto j = i->lines.begin();
 		BOOST_REQUIRE (j != i->lines.end ());
 		BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
-		sub::Block b = j->blocks.front ();
+		auto b = j->blocks.front();
 		BOOST_CHECK_EQUAL (b.font.get(), "theFont");
 		BOOST_CHECK_EQUAL (b.italic, false);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
@@ -528,10 +528,10 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));
 
 	{
-		list<sub::Line>::iterator j = i->lines.begin ();
+		auto j = i->lines.begin();
 		BOOST_REQUIRE (j != i->lines.end ());
 		BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
-		sub::Block b = j->blocks.front ();
+		auto b = j->blocks.front();
 		BOOST_CHECK_EQUAL (b.font.get(), "theFont");
 		BOOST_CHECK_EQUAL (b.italic, false);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
@@ -568,10 +568,10 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));
 
 	{
-		list<sub::Line>::iterator j = i->lines.begin ();
+		auto j = i->lines.begin();
 		BOOST_REQUIRE (j != i->lines.end ());
 		BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
-		sub::Block b = j->blocks.front ();
+		auto b = j->blocks.front();
 		BOOST_CHECK_EQUAL (b.font.get(), "theFont");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
diff --git a/test/dcp_to_stl_binary_test.cc b/test/dcp_to_stl_binary_test.cc
index 3c6f185..450b730 100644
--- a/test/dcp_to_stl_binary_test.cc
+++ b/test/dcp_to_stl_binary_test.cc
@@ -25,7 +25,7 @@
 #include <fstream>
 
 using std::ifstream;
-using std::list;
+using std::vector;
 
 BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test1)
 {
@@ -35,7 +35,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test1)
 
 	boost::filesystem::path p = private_test / "fd586c30-6d38-48f2-8241-27359acf184c_sub.xml";
 	sub::write_stl_binary (
-		sub::collect<list<sub::Subtitle> > (sub::DCPReader(p).subtitles ()),
+		sub::collect<vector<sub::Subtitle>> (sub::DCPReader(p).subtitles()),
 		25,
 		sub::LANGUAGE_FRENCH,
 		"", "",
@@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test2)
 
 	boost::filesystem::path p = private_test / "93e8a6bf-499e-4d36-9350-a9bfa2e6758a_sub.xml";
 	sub::write_stl_binary (
-		sub::collect<list<sub::Subtitle> > (sub::DCPReader(p).subtitles ()),
+		sub::collect<vector<sub::Subtitle>> (sub::DCPReader(p).subtitles()),
 		25,
 		sub::LANGUAGE_FRENCH,
 		"", "",
@@ -89,7 +89,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test3)
 
 	boost::filesystem::path p = private_test / "P_FTR_Subs_DE-FR_24fps_R1.xml";
 	sub::write_stl_binary (
-		sub::collect<list<sub::Subtitle> > (sub::DCPReader(p).subtitles ()),
+		sub::collect<vector<sub::Subtitle>> (sub::DCPReader(p).subtitles()),
 		25,
 		sub::LANGUAGE_FRENCH,
 		"", "",
@@ -111,7 +111,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test3)
 BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test4)
 {
 	sub::write_stl_binary (
-		sub::collect<list<sub::Subtitle> > (sub::DCPReader("test/data/test1.xml").subtitles ()),
+		sub::collect<vector<sub::Subtitle>> (sub::DCPReader("test/data/test1.xml").subtitles()),
 		25,
 		sub::LANGUAGE_FRENCH,
 		"", "",
@@ -133,7 +133,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test5)
 
 	boost::filesystem::path p = private_test / "065d39ff-6723-4dbf-a94f-849cde82f5e1_sub.mxf";
 	sub::write_stl_binary (
-		sub::collect<list<sub::Subtitle> > (sub::DCPReader(p).subtitles ()),
+		sub::collect<vector<sub::Subtitle>> (sub::DCPReader(p).subtitles()),
 		25,
 		sub::LANGUAGE_FRENCH,
 		"", "",
@@ -160,7 +160,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test6)
 
 	boost::filesystem::path p = private_test / "P_FTR_FullSubs_DE_24fps.xml";
 	sub::write_stl_binary (
-		sub::collect<list<sub::Subtitle> > (sub::DCPReader(p).subtitles ()),
+		sub::collect<vector<sub::Subtitle>> (sub::DCPReader(p).subtitles()),
 		24,
 		sub::LANGUAGE_GERMAN,
 		"", "",
@@ -183,7 +183,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test7)
 {
 	boost::filesystem::path p = "test/data/test3.xml";
 	sub::write_stl_binary (
-		sub::collect<list<sub::Subtitle> > (sub::DCPReader(p).subtitles ()),
+		sub::collect<vector<sub::Subtitle>> (sub::DCPReader(p).subtitles()),
 		24,
 		sub::LANGUAGE_GERMAN,
 		"", "",
@@ -206,7 +206,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test8)
 {
 	boost::filesystem::path p = private_test / "91a30f25-b415-4ffe-9623-bdae43a381d3_sub.xml";
 	sub::write_stl_binary (
-		sub::collect<list<sub::Subtitle> > (sub::DCPReader(p).subtitles()),
+		sub::collect<vector<sub::Subtitle>> (sub::DCPReader(p).subtitles()),
 		24,
 		sub::LANGUAGE_GERMAN,
 		"", "",
@@ -229,7 +229,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test9)
 {
 	boost::filesystem::path p = private_test / "8b95f204-f2a6-4586-8e67-2dc671a78e72_sub.xml";
 	sub::write_stl_binary (
-		sub::collect<list<sub::Subtitle> > (sub::DCPReader(p).subtitles()),
+		sub::collect<vector<sub::Subtitle>> (sub::DCPReader(p).subtitles()),
 		24,
 		sub::LANGUAGE_GERMAN,
 		"", "",
diff --git a/test/ssa_reader_test.cc b/test/ssa_reader_test.cc
index f8297b8..c29ff7c 100644
--- a/test/ssa_reader_test.cc
+++ b/test/ssa_reader_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -29,8 +29,8 @@
 #include <cmath>
 #include <iostream>
 
-using std::list;
 using std::fabs;
+using std::vector;
 
 BOOST_AUTO_TEST_CASE (ssa_reader_test)
 {
@@ -38,14 +38,14 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test)
 	FILE* f = fopen (p.string().c_str(), "r");
 	sub::SSAReader reader (f);
 	fclose (f);
-	list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+	auto subs = sub::collect<vector<sub::Subtitle>> (reader.subtitles());
 
-	list<sub::Subtitle>::iterator i = subs.begin ();
+	auto i = subs.begin ();
 
 	BOOST_REQUIRE (i != subs.end ());
 	BOOST_CHECK_EQUAL (i->from, sub::Time::from_hms (0, 2, 40, 650));
 	BOOST_CHECK_EQUAL (i->to, sub::Time::from_hms (0, 2, 41, 790));
-	list<sub::Line>::iterator j = i->lines.begin();
+	auto j = i->lines.begin();
 	BOOST_REQUIRE (j != i->lines.end ());
 	BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
 	sub::Block b = j->blocks.front ();
@@ -78,13 +78,13 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test)
 BOOST_AUTO_TEST_CASE (ssa_reader_line_test1)
 {
 	sub::RawSubtitle base;
-	list<sub::RawSubtitle> r = sub::SSAReader::parse_line (
+	auto r = sub::SSAReader::parse_line (
 		base,
 		"This is a line with some {\\i1}italics{\\i0} and then\\nthere is a new line.",
 		1920, 1080
 		);
 
-	list<sub::RawSubtitle>::const_iterator i = r.begin ();
+	auto i = r.begin();
 	BOOST_CHECK_EQUAL (i->text, "This is a line with some ");
 	BOOST_CHECK_EQUAL (i->italic, false);
 	++i;
@@ -108,13 +108,13 @@ BOOST_AUTO_TEST_CASE (ssa_reader_line_test1)
 BOOST_AUTO_TEST_CASE (ssa_reader_line_test2)
 {
 	sub::RawSubtitle base;
-	list<sub::RawSubtitle> r = sub::SSAReader::parse_line (
+	auto r = sub::SSAReader::parse_line (
 		base,
 		"{\\i1}It's all just italics{\\i0}",
 		1920, 1080
 		);
 
-	list<sub::RawSubtitle>::const_iterator i = r.begin ();
+	auto i = r.begin ();
 	BOOST_CHECK_EQUAL (i->text, "It's all just italics");
 	BOOST_CHECK_EQUAL (i->italic, true);
 	++i;
@@ -192,11 +192,11 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test3)
 	FILE* f = fopen (p.string().c_str(), "r");
 	sub::SSAReader reader (f);
 	fclose (f);
-	list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+	auto subs = sub::collect<vector<sub::Subtitle>> (reader.subtitles());
 
-	list<sub::Subtitle>::iterator i = subs.begin ();
-	list<sub::Line>::iterator j;
-	list<sub::Block>::iterator k;
+	auto i = subs.begin();
+	vector<sub::Line>::iterator j;
+	vector<sub::Block>::iterator k;
 
 	/* Hello world */
 	SUB_START (sub::Time::from_hms (0, 0, 1, 230), sub::Time::from_hms (0, 0, 4, 550));
@@ -281,11 +281,11 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test4)
 	FILE* f = fopen (p.string().c_str(), "r");
 	sub::SSAReader reader (f);
 	fclose (f);
-	list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+	auto subs = sub::collect<vector<sub::Subtitle>> (reader.subtitles());
 
-	list<sub::Subtitle>::iterator i = subs.begin ();
-	list<sub::Line>::iterator j;
-	list<sub::Block>::iterator k;
+	auto i = subs.begin();
+	vector<sub::Line>::iterator j;
+	vector<sub::Block>::iterator k;
 
 	BOOST_REQUIRE (i != subs.end ());
 
@@ -329,11 +329,11 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test5)
 	FILE* f = fopen (p.string().c_str(), "r");
 	sub::SSAReader reader (f);
 	fclose (f);
-	list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+	auto subs = sub::collect<vector<sub::Subtitle>> (reader.subtitles());
 
-	list<sub::Subtitle>::iterator i = subs.begin ();
-	list<sub::Line>::iterator j;
-	list<sub::Block>::iterator k;
+	auto i = subs.begin ();
+	vector<sub::Line>::iterator j;
+	vector<sub::Block>::iterator k;
 
 	BOOST_REQUIRE (i != subs.end ());
 
@@ -378,11 +378,11 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test6)
 	BOOST_REQUIRE (f);
 	sub::SSAReader reader (f);
 	fclose (f);
-	list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+	auto subs = sub::collect<vector<sub::Subtitle>> (reader.subtitles());
 
-	list<sub::Subtitle>::iterator i = subs.begin ();
-	list<sub::Line>::iterator j;
-	list<sub::Block>::iterator k;
+	auto i = subs.begin ();
+	vector<sub::Line>::iterator j;
+	vector<sub::Block>::iterator k;
 
 	BOOST_REQUIRE (i != subs.end ());
 
@@ -459,11 +459,11 @@ BOOST_AUTO_TEST_CASE (ssa_reader_pos)
 	FILE* f = fopen (p.string().c_str(), "r");
 	sub::SSAReader reader (f);
 	fclose (f);
-	list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+	auto subs = sub::collect<vector<sub::Subtitle>> (reader.subtitles());
 
-	list<sub::Subtitle>::iterator i = subs.begin ();
-	list<sub::Line>::iterator j;
-	list<sub::Block>::iterator k;
+	auto i = subs.begin ();
+	vector<sub::Line>::iterator j;
+	vector<sub::Block>::iterator k;
 
 	/* Hello world */
 	SUB_START (sub::Time::from_hms (0, 0, 1, 230), sub::Time::from_hms (0, 0, 4, 550));
@@ -478,13 +478,13 @@ BOOST_AUTO_TEST_CASE (ssa_reader_pos)
 BOOST_AUTO_TEST_CASE (ssa_reader_fs)
 {
 	sub::RawSubtitle base;
-	list<sub::RawSubtitle> r = sub::SSAReader::parse_line (
+	auto r = sub::SSAReader::parse_line (
 		base,
 		"This is a line with some {\\fs64}font sizing.",
 		1920, 1080
 		);
 
-	list<sub::RawSubtitle>::const_iterator i = r.begin ();
+	auto i = r.begin ();
 	BOOST_CHECK_EQUAL (i->text, "This is a line with some ");
 	++i;
 	BOOST_REQUIRE (i != r.end ());
@@ -500,13 +500,13 @@ BOOST_AUTO_TEST_CASE (ssa_reader_fs)
 BOOST_AUTO_TEST_CASE (ssa_reader_c)
 {
 	sub::RawSubtitle base;
-	list<sub::RawSubtitle> r = sub::SSAReader::parse_line (
+	auto r = sub::SSAReader::parse_line (
 		base,
 		"{\\c&H00FFFF&}Dieser Untertitel ist gelb",
 		1920, 1080
 		);
 
-	list<sub::RawSubtitle>::const_iterator i = r.begin ();
+	auto i = r.begin ();
 	BOOST_CHECK_EQUAL (i->text, "Dieser Untertitel ist gelb");
 	BOOST_CHECK (i->colour == sub::Colour::from_rgb_hex("ffff00"));
 	++i;
diff --git a/test/stl_binary_reader_test.cc b/test/stl_binary_reader_test.cc
index bad4bc4..fd01c9c 100644
--- a/test/stl_binary_reader_test.cc
+++ b/test/stl_binary_reader_test.cc
@@ -24,7 +24,6 @@
 #include <boost/test/unit_test.hpp>
 #include <fstream>
 
-using std::list;
 using std::ifstream;
 using std::ofstream;
 using std::shared_ptr;
diff --git a/test/stl_binary_writer_test.cc b/test/stl_binary_writer_test.cc
index f77cba5..94e3b09 100644
--- a/test/stl_binary_writer_test.cc
+++ b/test/stl_binary_writer_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,12 +21,12 @@
 #include "subtitle.h"
 #include <boost/test/unit_test.hpp>
 
-using std::list;
+using std::vector;
 
 /** Test writing of a binary STL file */
 BOOST_AUTO_TEST_CASE (stl_binary_writer_test)
 {
-	list<sub::Subtitle> subs;
+	vector<sub::Subtitle> subs;
 
 	{
 		sub::Subtitle s;
diff --git a/test/stl_text_reader_test.cc b/test/stl_text_reader_test.cc
index 162790f..f0ec969 100644
--- a/test/stl_text_reader_test.cc
+++ b/test/stl_text_reader_test.cc
@@ -23,7 +23,6 @@
 #include <boost/test/unit_test.hpp>
 #include <fstream>
 
-using std::list;
 using std::ifstream;
 using std::vector;
 
@@ -32,9 +31,9 @@ BOOST_AUTO_TEST_CASE (stl_text_reader_test)
 {
 	ifstream file ("test/data/test_text.stl");
 	sub::STLTextReader reader (file);
-	list<sub::Subtitle> subs = sub::collect<list<sub::Subtitle> > (reader.subtitles ());
+	auto subs = sub::collect<vector<sub::Subtitle>> (reader.subtitles());
 
-	list<sub::Subtitle>::iterator i = subs.begin ();
+	auto i = subs.begin ();
 
 
 	/* First subtitle */
@@ -43,10 +42,10 @@ BOOST_AUTO_TEST_CASE (stl_text_reader_test)
 	BOOST_CHECK_EQUAL (i->from, sub::Time::from_hmsf (0, 0, 41, 9));
 	BOOST_CHECK_EQUAL (i->to, sub::Time::from_hmsf (0, 0, 42, 21));
 
-	list<sub::Line>::iterator j = i->lines.begin ();
+	auto j = i->lines.begin ();
 	BOOST_CHECK (j != i->lines.end ());
 	BOOST_CHECK_EQUAL (j->blocks.size(), 1);
-	sub::Block b = j->blocks.front ();
+	auto b = j->blocks.front ();
 	BOOST_CHECK_EQUAL (b.text, " This is a subtitle ");
 	BOOST_CHECK_EQUAL (b.font.get(), "Arial");
 	BOOST_CHECK_EQUAL (b.font_size.points().get(), 42);
@@ -80,7 +79,7 @@ BOOST_AUTO_TEST_CASE (stl_text_reader_test)
 	BOOST_CHECK_EQUAL (l.blocks.size(), 7);
 	BOOST_CHECK_EQUAL (l.vertical_position.line.get(), 0);
 
-	list<sub::Block>::iterator k = l.blocks.begin ();
+	auto k = l.blocks.begin ();
 
 	BOOST_CHECK (k != l.blocks.end ());
 	BOOST_CHECK_EQUAL (k->text, " This is some ");
diff --git a/test/subrip_reader_test.cc b/test/subrip_reader_test.cc
index bb8f71c..818b6ad 100644
--- a/test/subrip_reader_test.cc
+++ b/test/subrip_reader_test.cc
@@ -28,7 +28,6 @@
 #include <iostream>
 #include <cstdio>
 
-using std::list;
 using std::cerr;
 using std::vector;
 using std::fabs;
@@ -39,9 +38,9 @@ BOOST_AUTO_TEST_CASE (subrip_reader_test)
 	FILE* f = fopen ("test/data/test.srt", "r");
 	sub::SubripReader reader (f);
 	fclose (f);
-	list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+	auto subs = sub::collect<std::vector<sub::Subtitle>> (reader.subtitles());
 
-	list<sub::Subtitle>::iterator i = subs.begin ();
+	auto i = subs.begin ();
 
 
 	/* First subtitle */
@@ -50,10 +49,10 @@ BOOST_AUTO_TEST_CASE (subrip_reader_test)
 	BOOST_CHECK_EQUAL (i->from, sub::Time::from_hms (0, 0, 41, 90));
 	BOOST_CHECK_EQUAL (i->to, sub::Time::from_hms (0, 0, 42, 210));
 
-	list<sub::Line>::iterator j = i->lines.begin ();
+	auto j = i->lines.begin();
 	BOOST_CHECK (j != i->lines.end ());
 	BOOST_CHECK_EQUAL (j->blocks.size(), 1);
-	sub::Block b = j->blocks.front ();
+	auto b = j->blocks.front();
 	BOOST_CHECK_EQUAL (b.text, "This is a subtitle");
 	/* No font is specified by subrip, so none should be seen here */
 	BOOST_CHECK (!b.font);
@@ -94,7 +93,7 @@ BOOST_AUTO_TEST_CASE (subrip_reader_test)
 	BOOST_CHECK_EQUAL (l.vertical_position.line.get(), 0);
 	BOOST_CHECK_EQUAL (l.vertical_position.reference.get(), sub::TOP_OF_SUBTITLE);
 
-	list<sub::Block>::iterator k = l.blocks.begin ();
+	auto k = l.blocks.begin();
 
 	BOOST_CHECK (k != l.blocks.end ());
 	BOOST_CHECK_EQUAL (k->text, "This is some ");
@@ -175,9 +174,9 @@ BOOST_AUTO_TEST_CASE (subrip_reader_test2)
 	FILE* f = fopen ("test/data/test2.srt", "r");
 	sub::SubripReader reader (f);
 	fclose (f);
-	list<sub::Subtitle> subs = sub::collect<list<sub::Subtitle> > (reader.subtitles ());
+	auto subs = sub::collect<vector<sub::Subtitle>> (reader.subtitles());
 
-	list<sub::Subtitle>::const_iterator i = subs.begin();
+	auto i = subs.begin();
 
 	BOOST_CHECK (i != subs.end ());
 	BOOST_CHECK_EQUAL (i->from, sub::Time::from_hms (0, 1, 49, 200));
@@ -293,7 +292,7 @@ BOOST_AUTO_TEST_CASE (subrip_reader_convert_line_test)
 	rs = sub::RawSubtitle();
 	r.convert_line ("<b>This is <i>nesting</i> of subtitles</b>", rs);
 	BOOST_CHECK_EQUAL (r._subs.size(), 3);
-	list<sub::RawSubtitle>::iterator i = r._subs.begin ();
+	auto i = r._subs.begin();
 	BOOST_CHECK_EQUAL (i->text, "This is ");
 	BOOST_CHECK_EQUAL (i->bold, true);
 	BOOST_CHECK_EQUAL (i->italic, false);
@@ -461,11 +460,11 @@ BOOST_AUTO_TEST_CASE (subrip_reader_test3)
 	FILE* f = fopen (p.string().c_str(), "r");
 	sub::SubripReader reader (f);
 	fclose (f);
-	list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+	auto subs = sub::collect<std::vector<sub::Subtitle>> (reader.subtitles());
 
-	list<sub::Subtitle>::iterator i = subs.begin ();
-	list<sub::Line>::iterator j;
-	list<sub::Block>::iterator k;
+	auto i = subs.begin ();
+	vector<sub::Line>::iterator j;
+	vector<sub::Block>::iterator k;
 
 	BOOST_REQUIRE (i != subs.end ());
 
@@ -538,9 +537,9 @@ BOOST_AUTO_TEST_CASE (subrip_reader_test4)
 	FILE* f = fopen (p.string().c_str(), "r");
 	sub::SubripReader reader (f);
 	fclose (f);
-	list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> >(reader.subtitles());
+	auto subs = sub::collect<std::vector<sub::Subtitle>>(reader.subtitles());
 
-	list<sub::Subtitle>::iterator i = subs.begin ();
+	auto i = subs.begin();
 	std::cout << i->lines.front().blocks.front().text << "\n";
 
 	std::string const t = i->lines.front().blocks.front().text;