Replace String::compose with fmt.

sed -i "/Plural-Forms/n;/%100/n;/scanf/n;s/%[123456789]/{}/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/tools/*.cc src/lib/po/*.po src/wx/po/*.po src/tools/po/*.po test/*.cc
sed -i "s/String::compose */fmt::format/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/tools/*.cc test/*.cc

1 files changed, 9 insertions, 9 deletions

diff --git a/src/lib/scp_uploader.cc b/src/lib/scp_uploader.cc
index 5f1c09ce9..da8bc1866 100644
--- a/src/lib/scp_uploader.cc
+++ b/src/lib/scp_uploader.cc
@@ -44,7 +44,7 @@ SCPUploader::SCPUploader(function<void (string)> set_status, function<void (floa
 {
 	_session = ssh_new();
 	if (!_session) {
-		throw NetworkError(String::compose(_("SSH error [%1]"), "ssh_new"));
+		throw NetworkError(fmt::format(_("SSH error [{}]"), "ssh_new"));
 	}
 
 	ssh_options_set(_session, SSH_OPTIONS_HOST, Config::instance()->tms_ip().c_str());
@@ -54,33 +54,33 @@ SCPUploader::SCPUploader(function<void (string)> set_status, function<void (floa
 
 	int r = ssh_connect(_session);
 	if (r != SSH_OK) {
-		throw NetworkError(String::compose(_("Could not connect to server %1 (%2)"), Config::instance()->tms_ip(), ssh_get_error(_session)));
+		throw NetworkError(fmt::format(_("Could not connect to server {} ({})"), Config::instance()->tms_ip(), ssh_get_error(_session)));
 	}
 
 LIBDCP_DISABLE_WARNINGS
 	r = ssh_is_server_known(_session);
 	if (r == SSH_SERVER_ERROR) {
-		throw NetworkError(String::compose(_("SSH error [%1] (%2)"), "ssh_is_server_known", ssh_get_error(_session)));
+		throw NetworkError(fmt::format(_("SSH error [{}] ({})"), "ssh_is_server_known", ssh_get_error(_session)));
 	}
 LIBDCP_ENABLE_WARNINGS
 
 	r = ssh_userauth_password(_session, 0, Config::instance()->tms_password().c_str());
 	if (r != SSH_AUTH_SUCCESS) {
-		throw NetworkError(String::compose(_("Failed to authenticate with server (%1)"), ssh_get_error(_session)));
+		throw NetworkError(fmt::format(_("Failed to authenticate with server ({})"), ssh_get_error(_session)));
 	}
 
 LIBDCP_DISABLE_WARNINGS
 	_scp = ssh_scp_new(_session, SSH_SCP_WRITE | SSH_SCP_RECURSIVE, Config::instance()->tms_path().c_str());
 LIBDCP_ENABLE_WARNINGS
 	if (!_scp) {
-		throw NetworkError(String::compose(_("SSH error [%1] (%2)"), "ssh_scp_new", ssh_get_error(_session)));
+		throw NetworkError(fmt::format(_("SSH error [{}] ({})"), "ssh_scp_new", ssh_get_error(_session)));
 	}
 
 LIBDCP_DISABLE_WARNINGS
 	r = ssh_scp_init(_scp);
 LIBDCP_ENABLE_WARNINGS
 	if (r != SSH_OK) {
-		throw NetworkError(String::compose(_("SSH error [%1] (%2)"), "ssh_scp_init", ssh_get_error(_session)));
+		throw NetworkError(fmt::format(_("SSH error [{}] ({})"), "ssh_scp_init", ssh_get_error(_session)));
 	}
 }
 
@@ -103,7 +103,7 @@ LIBDCP_DISABLE_WARNINGS
 	int const r = ssh_scp_push_directory(_scp, directory.generic_string().c_str(), S_IRWXU);
 LIBDCP_ENABLE_WARNINGS
 	if (r != SSH_OK) {
-		throw NetworkError(String::compose(_("Could not create remote directory %1 (%2)"), directory.string(), ssh_get_error(_session)));
+		throw NetworkError(fmt::format(_("Could not create remote directory {} ({})"), directory.string(), ssh_get_error(_session)));
 	}
 }
 
@@ -119,7 +119,7 @@ LIBDCP_ENABLE_WARNINGS
 
 	dcp::File f(from, "rb");
 	if (!f) {
-		throw NetworkError(String::compose(_("Could not open %1 to send"), from.string()));
+		throw NetworkError(fmt::format(_("Could not open {} to send"), from.string()));
 	}
 
 	std::vector<char> buffer(64 * 1024);
@@ -135,7 +135,7 @@ LIBDCP_DISABLE_WARNINGS
 		int const r = ssh_scp_write(_scp, buffer.data(), t);
 LIBDCP_ENABLE_WARNINGS
 		if (r != SSH_OK) {
-			throw NetworkError(String::compose(_("Could not write to remote file (%1)"), ssh_get_error(_session)));
+			throw NetworkError(fmt::format(_("Could not write to remote file ({})"), ssh_get_error(_session)));
 		}
 		to_do -= t;
 		transferred += t;