Use dcp::compose rather than our own.compose

1 files changed, 8 insertions, 8 deletions

diff --git a/src/lib/exceptions.h b/src/lib/exceptions.h
index 5cbf69941..d6a0055c3 100644
--- a/src/lib/exceptions.h
+++ b/src/lib/exceptions.h
@@ -28,7 +28,7 @@
 #define DCPOMATIC_EXCEPTIONS_H
 
 
-#include "compose.hpp"
+#include <dcp/compose.h>
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
@@ -50,19 +50,19 @@ public:
 	{}
 
 	DecodeError (std::string function, std::string caller)
-		: std::runtime_error (String::compose("%1 failed [%2]", function, caller))
+		: std::runtime_error (dcp::compose("%1 failed [%2]", function, caller))
 	{}
 
 	DecodeError (std::string function, std::string caller, int error)
-		: std::runtime_error (String::compose("%1 failed [%2] (%3)", function, caller, error))
+		: std::runtime_error (dcp::compose("%1 failed [%2] (%3)", function, caller, error))
 	{}
 
 	DecodeError (std::string function, std::string caller, boost::filesystem::path file)
-		: std::runtime_error (String::compose("%1 failed [%2] (%3)", function, caller, file.string()))
+		: std::runtime_error (dcp::compose("%1 failed [%2] (%3)", function, caller, file.string()))
 	{}
 
 	DecodeError (std::string function, std::string caller, int error, boost::filesystem::path file)
-		: std::runtime_error (String::compose("%1 failed [%2] (%3) (%4)", function, caller, error, file.string()))
+		: std::runtime_error (dcp::compose("%1 failed [%2] (%3) (%4)", function, caller, error, file.string()))
 	{}
 };
 
@@ -87,11 +87,11 @@ public:
 	{}
 
 	explicit EncodeError (std::string function, std::string caller)
-		: std::runtime_error (String::compose("%1 failed [%2]", function, caller))
+		: std::runtime_error (dcp::compose("%1 failed [%2]", function, caller))
 	{}
 
 	explicit EncodeError (std::string function, std::string caller, int error)
-		: std::runtime_error (String::compose("%1 failed [%2] (%3)", function, caller, error))
+		: std::runtime_error (dcp::compose("%1 failed [%2] (%3)", function, caller, error))
 	{}
 };
 
@@ -106,7 +106,7 @@ public:
 	 *  @param f Name of the file that this exception concerns.
 	 */
 	FileError (std::string m, boost::filesystem::path f)
-		: std::runtime_error (String::compose("%1 with %2", m, f.string()))
+		: std::runtime_error (dcp::compose("%1 with %2", m, f.string()))
 		, _file (f)
 	{}