diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
| commit | 5b0e331380c83ec9835e8aa42fd342b2f0ad275d (patch) | |
| tree | 13c27f0b3420f5c3a268a5a22a9172675fdc370c /src/wx/christie_certificate_panel.cc | |
| parent | 5d838bc863a7569e68546026c109607fd5a94362 (diff) | |
Use dcp::compose rather than our own.compose
Diffstat (limited to 'src/wx/christie_certificate_panel.cc')
| -rw-r--r-- | src/wx/christie_certificate_panel.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wx/christie_certificate_panel.cc b/src/wx/christie_certificate_panel.cc index ab131e015..77a067fb5 100644 --- a/src/wx/christie_certificate_panel.cc +++ b/src/wx/christie_certificate_panel.cc @@ -22,8 +22,8 @@ #include "download_certificate_dialog.h" #include "wx_util.h" #include "lib/internet.h" -#include "lib/compose.hpp" #include "lib/config.h" +#include <dcp/compose.h> using std::string; using boost::optional; @@ -50,7 +50,7 @@ ChristieCertificatePanel::ChristieCertificatePanel (DownloadCertificateDialog* d void ChristieCertificatePanel::do_download () { - string const prefix = String::compose( + string const prefix = dcp::compose( "ftp://%1:%2@certificates.christiedigital.com/Certificates/", Config::instance()->christie_username().get(), Config::instance()->christie_password().get() @@ -59,7 +59,7 @@ ChristieCertificatePanel::do_download () string serial = wx_to_std (_serial->GetValue()); serial.insert (0, 12 - serial.length(), '0'); - string const url = String::compose ("%1F-IMB/F-IMB_%2_sha256.pem", prefix, serial); + string const url = dcp::compose ("%1F-IMB/F-IMB_%2_sha256.pem", prefix, serial); optional<string> all_errors; bool ok = true; @@ -68,7 +68,7 @@ ChristieCertificatePanel::do_download () if (error) { all_errors = *error; - string const url = String::compose ("%1IMB-S2/IMB-S2_%2_sha256.pem", prefix, serial); + string const url = dcp::compose ("%1IMB-S2/IMB-S2_%2_sha256.pem", prefix, serial); error = get_from_url (url, true, false, boost::bind(&DownloadCertificatePanel::load_certificate_from_chain, this, _1)); if (error) { |