s/DCPReadError/ReadError/g

4 files changed, 21 insertions, 21 deletions

diff --git a/test/dcp_time_test.cc b/test/dcp_time_test.cc
index 7263d924..504e9fd1 100644
--- a/test/dcp_time_test.cc
+++ b/test/dcp_time_test.cc
@@ -133,24 +133,24 @@ BOOST_AUTO_TEST_CASE (dcp_time)
 	BOOST_CHECK_EQUAL (a, dcp::Time (1, 23, 45, 12, 250));
 
 	/* Check some disallowed constructions from string */
-	BOOST_CHECK_THROW (dcp::Time ("01:23:45:1234", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01:23:45:1234:66", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01:23:45:", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01:23::123", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01::45:123", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time (":23:45:123", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01:23:45.1234", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01:23:45.1234.66", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01:23:45.", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01:23:.123", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01::45.123", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time (":23:45.123", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01:23:45:123", 250), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01:23:45:123:66", 250), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01:23:45:", 250), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01:23::123", 250), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01::45:123", 250), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time (":23:45:123", 250), dcp::DCPReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23:45:1234", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23:45:1234:66", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23:45:", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23::123", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01::45:123", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time (":23:45:123", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23:45.1234", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23:45.1234.66", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23:45.", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23:.123", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01::45.123", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time (":23:45.123", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23:45:123", 250), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23:45:123:66", 250), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23:45:", 250), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23::123", 250), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01::45:123", 250), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time (":23:45:123", 250), dcp::ReadError);
 
 	/* Check operator< and operator> */
 	BOOST_CHECK (dcp::Time (3, 2, 3, 4, 24) < dcp::Time (3, 2, 3, 5, 24));
diff --git a/test/effect_test.cc b/test/effect_test.cc
index ac0d6b44..bcc03211 100644
--- a/test/effect_test.cc
+++ b/test/effect_test.cc
@@ -47,5 +47,5 @@ BOOST_AUTO_TEST_CASE (effect_test)
 	BOOST_CHECK_EQUAL (dcp::string_to_effect ("none"), dcp::NONE);
 	BOOST_CHECK_EQUAL (dcp::string_to_effect ("border"), dcp::BORDER);
 	BOOST_CHECK_EQUAL (dcp::string_to_effect ("shadow"), dcp::SHADOW);
-	BOOST_CHECK_THROW (dcp::string_to_effect ("fish"), dcp::DCPReadError);
+	BOOST_CHECK_THROW (dcp::string_to_effect ("fish"), dcp::ReadError);
 }
diff --git a/test/rewrite_subs.cc b/test/rewrite_subs.cc
index d8ec4eea..90718fae 100644
--- a/test/rewrite_subs.cc
+++ b/test/rewrite_subs.cc
@@ -77,7 +77,7 @@ main (int argc, char* argv[])
 		cerr << e.what() << " (" << e.filename() << ") when reading " << argv[1] << "\n";
 		exit (EXIT_FAILURE);
 	}
-	catch (DCPReadError& e)
+	catch (ReadError& e)
 	{
 		cerr << e.what() << " when reading " << argv[1] << "\n";
 		exit (EXIT_FAILURE);
diff --git a/test/sound_frame_test.cc b/test/sound_frame_test.cc
index 587d7400..d0840d8c 100644
--- a/test/sound_frame_test.cc
+++ b/test/sound_frame_test.cc
@@ -85,5 +85,5 @@ BOOST_AUTO_TEST_CASE (sound_frame_test2)
 		"TONEPLATES-SMPTE-PLAINTEXT_TST_F_XX-XX_ITL-TD_51-XX_2K_WOE_20111001_WOE_OV/pcm_95734608-5d47-4d3f-bf5f-9e9186b66afa_.mxf"
 		);
 
-	BOOST_CHECK_THROW (asset.start_read()->get_frame (99999999), dcp::DCPReadError);
+	BOOST_CHECK_THROW (asset.start_read()->get_frame (99999999), dcp::ReadError);
 }