diff options
Diffstat (limited to 'src/wx/christie_certificate_panel.cc')
| -rw-r--r-- | src/wx/christie_certificate_panel.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/wx/christie_certificate_panel.cc b/src/wx/christie_certificate_panel.cc index 3536f5045..de4c6969d 100644 --- a/src/wx/christie_certificate_panel.cc +++ b/src/wx/christie_certificate_panel.cc @@ -22,7 +22,6 @@ #include "download_certificate_dialog.h" #include "wx_util.h" #include "lib/internet.h" -#include "lib/compose.hpp" #include "lib/config.h" using std::string; @@ -50,8 +49,8 @@ ChristieCertificatePanel::ChristieCertificatePanel (DownloadCertificateDialog* d void ChristieCertificatePanel::do_download () { - string const prefix = String::compose( - "ftp://%1:%2@certificates.christiedigital.com/Certificates/", + string const prefix = fmt::format( + "ftp://{}:{}@certificates.christiedigital.com/Certificates/", Config::instance()->christie_username().get(), Config::instance()->christie_password().get() ); @@ -59,7 +58,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 = fmt::format("{}F-IMB/F-IMB_{}_sha256.pem", prefix, serial); optional<string> all_errors; bool ok = true; @@ -68,7 +67,7 @@ ChristieCertificatePanel::do_download () if (error) { all_errors = *error; - auto const url = String::compose ("%1IMB-S2/IMB-S2_%2_sha256.pem", prefix, serial); + auto const url = fmt::format("{}IMB-S2/IMB-S2_{}_sha256.pem", prefix, serial); error = get_from_url (url, true, false, boost::bind(&DownloadCertificatePanel::load_certificate_from_chain, this, _1, _2)); if (error) { |