From 5b0e331380c83ec9835e8aa42fd342b2f0ad275d Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 10 Jul 2021 02:02:19 +0200
Subject: Use dcp::compose rather than our own.

---
 src/lib/internet.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib/internet.cc')

diff --git a/src/lib/internet.cc b/src/lib/internet.cc
index ca72399f3..648e4b1a9 100644
--- a/src/lib/internet.cc
+++ b/src/lib/internet.cc
@@ -20,10 +20,10 @@
 
 
 #include "scoped_temporary.h"
-#include "compose.hpp"
 #include "exceptions.h"
 #include "cross.h"
 #include "util.h"
+#include <dcp/compose.h>
 #include <curl/curl.h>
 #include <zip.h>
 #include <boost/optional.hpp>
@@ -118,7 +118,7 @@ get_from_url (string url, bool pasv, bool skip_pasv_ip, ScopedTemporary& temp)
 	temp.close ();
 	curl_easy_cleanup (curl);
 	if (cr != CURLE_OK) {
-		return String::compose (_("Download failed (%1 error %2)"), url, (int) cr);
+		return dcp::compose (_("Download failed (%1 error %2)"), url, (int) cr);
 	}
 
 	return optional<string>();
@@ -173,7 +173,7 @@ get_from_zip_url (string url, string file, bool pasv, bool skip_pasv_ip, functio
 	zip_error_init (&error);
 	auto zip = zip_open_from_source (zip_source, ZIP_RDONLY, &error);
 	if (!zip) {
-		return String::compose (_("Could not open downloaded ZIP file (%1:%2: %3)"), error.zip_err, error.sys_err, error.str ? error.str : "");
+		return dcp::compose (_("Could not open downloaded ZIP file (%1:%2: %3)"), error.zip_err, error.sys_err, error.str ? error.str : "");
 	}
 
 #else
-- 
cgit v1.2.3