X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fqube_certificate_panel.cc;h=e1c6bfb41ae2c4dca09c902efadc38d7544fc9aa;hb=e72a69ac2ebf24df05ba4b6de65bfa338a58b0ec;hp=3def3b9d448c589ec1b5a48f5c7c45bd24c74147;hpb=2c844e57ed5c54e65a2b4484f02907122a03361e;p=dcpomatic.git

diff --git a/src/wx/qube_certificate_panel.cc b/src/wx/qube_certificate_panel.cc
index 3def3b9d4..e1c6bfb41 100644
--- a/src/wx/qube_certificate_panel.cc
+++ b/src/wx/qube_certificate_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2019-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "qube_certificate_panel.h"
 #include "download_certificate_dialog.h"
 #include "wx_util.h"
@@ -26,12 +27,18 @@
 #include "lib/config.h"
 #include <boost/algorithm/string/predicate.hpp>
 
+
 using std::string;
 using std::list;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
 
 static string const base = "ftp://certificates.qubecinema.com/";
 
+
 QubeCertificatePanel::QubeCertificatePanel (DownloadCertificateDialog* dialog, string type)
 	: DownloadCertificatePanel (dialog)
 	, _type (type)
@@ -39,18 +46,19 @@ QubeCertificatePanel::QubeCertificatePanel (DownloadCertificateDialog* dialog, s
 
 }
 
+
 void
 QubeCertificatePanel::do_download ()
 {
-	list<string> files = ls_url(String::compose("%1SMPTE-%2/", base, _type));
+	auto files = ls_url(String::compose("%1SMPTE-%2/", base, _type));
 	if (files.empty()) {
 		error_dialog (this, _("Could not read certificates from Qube server."));
 		return;
 	}
 
-	string const serial = wx_to_std(_serial->GetValue());
+	auto const serial = wx_to_std(_serial->GetValue());
 	optional<string> name;
-	BOOST_FOREACH (string i, files) {
+	for (auto i: files) {
 		if (boost::algorithm::starts_with(i, String::compose("%1-%2-", _type, serial))) {
 			name = i;
 			break;
@@ -63,7 +71,7 @@ QubeCertificatePanel::do_download ()
 		return;
 	}
 
-	optional<string> error = get_from_url (String::compose("%1SMPTE-%2/%3", base, _type, *name), true, false, boost::bind(&DownloadCertificatePanel::load_certificate, this, _1));
+	auto error = get_from_url (String::compose("%1SMPTE-%2/%3", base, _type, *name), true, false, boost::bind(&DownloadCertificatePanel::load_certificate, this, _1));
 
 	if (error) {
 		_dialog->message()->SetLabel(wxT(""));
@@ -74,6 +82,7 @@ QubeCertificatePanel::do_download ()
 	}
 }
 
+
 wxString
 QubeCertificatePanel::name () const
 {