Remove String namespace from around compose().compose

1 files changed, 14 insertions, 14 deletions

diff --git a/src/exceptions.cc b/src/exceptions.cc
index 3cf1a782..12f8ec12 100644
--- a/src/exceptions.cc
+++ b/src/exceptions.cc
@@ -48,7 +48,7 @@ using namespace dcp;
 
 
 FileError::FileError (string message, boost::filesystem::path filename, int number)
-	: runtime_error (String::compose ("%1 (%2) (error %3)", message, filename.string(), number))
+	: runtime_error (compose("%1 (%2) (error %3)", message, filename.string(), number))
 	, _filename (filename)
 	, _number (number)
 {
@@ -57,49 +57,49 @@ FileError::FileError (string message, boost::filesystem::path filename, int numb
 
 
 UnresolvedRefError::UnresolvedRefError (string id)
-	: runtime_error (String::compose ("Unresolved reference to asset id %1", id))
+	: runtime_error (compose("Unresolved reference to asset id %1", id))
 {
 
 }
 
 
 TimeFormatError::TimeFormatError (string bad_time)
-	: runtime_error (String::compose ("Bad time string %1", bad_time))
+	: runtime_error (compose("Bad time string %1", bad_time))
 {
 
 }
 
 
 BadContentKindError::BadContentKindError (string content_kind)
-	: ReadError (String::compose("Bad content kind '%1'", content_kind))
+	: ReadError (compose("Bad content kind '%1'", content_kind))
 {
 
 }
 
 
 NotEncryptedError::NotEncryptedError (string const & what)
-	: runtime_error (String::compose ("%1 is not encrypted", what))
+	: runtime_error (compose("%1 is not encrypted", what))
 {
 
 }
 
 
 ProgrammingError::ProgrammingError (string file, int line)
-	: runtime_error (String::compose ("Programming error at %1:%2", file, line))
+	: runtime_error (compose("Programming error at %1:%2", file, line))
 {
 
 }
 
 
 KDMDecryptionError::KDMDecryptionError (std::string message, int cipher_length, int modulus_dmax)
-	: runtime_error (String::compose ("Could not decrypt KDM (%1) (%2/%3)", message, cipher_length, modulus_dmax))
+	: runtime_error (compose("Could not decrypt KDM (%1) (%2/%3)", message, cipher_length, modulus_dmax))
 {
 
 }
 
 
 KDMFormatError::KDMFormatError (std::string message)
-	: runtime_error (String::compose ("Could not parse KDM (%1)", message))
+	: runtime_error (compose("Could not parse KDM (%1)", message))
 {
 
 }
@@ -113,7 +113,7 @@ CertificateChainError::CertificateChainError (string message)
 
 
 ReadError::ReadError (string message, string detail)
-	: runtime_error(String::compose("%1 (%2)", message, detail))
+	: runtime_error(compose("%1 (%2)", message, detail))
 	, _message(message)
 	, _detail(detail)
 {
@@ -122,7 +122,7 @@ ReadError::ReadError (string message, string detail)
 
 
 MissingSubtitleImageError::MissingSubtitleImageError (string id)
-	: runtime_error (String::compose("Could not load image for subtitle %1", id))
+	: runtime_error (compose("Could not load image for subtitle %1", id))
 {
 
 }
@@ -141,7 +141,7 @@ BadKDMDateError::BadKDMDateError (bool starts_too_early)
 
 
 StartCompressionError::StartCompressionError (optional<int> code)
-	: runtime_error (String::compose("Could not start JPEG2000 encoding%1", code ? String::compose(" (%1", *code) : ""))
+	: runtime_error (compose("Could not start JPEG2000 encoding%1", code ? compose(" (%1", *code) : ""))
 	, _code (code)
 {}
 
@@ -172,14 +172,14 @@ DuplicateIdError::DuplicateIdError (std::string message)
 
 
 MainSoundConfigurationError::MainSoundConfigurationError (std::string s)
-	: runtime_error (String::compose("Could not parse MainSoundConfiguration %1", s))
+	: runtime_error (compose("Could not parse MainSoundConfiguration %1", s))
 {
 
 }
 
 
 UnknownChannelIdError::UnknownChannelIdError (std::string id)
-	: runtime_error (String::compose("Unrecognised channel id '%1'", id))
+	: runtime_error (compose("Unrecognised channel id '%1'", id))
 {
 
 }
@@ -193,7 +193,7 @@ NoReelsError::NoReelsError ()
 
 
 MissingAssetmapError::MissingAssetmapError (boost::filesystem::path dir)
-	: ReadError (String::compose("Could not find ASSETMAP nor ASSETMAP.xml in '%1'", dir.string()))
+	: ReadError (compose("Could not find ASSETMAP nor ASSETMAP.xml in '%1'", dir.string()))
 {
 
 }