#include "download_certificate_dialog.h"
#include "wx_util.h"
#include "lib/compose.hpp"
-#include "lib/util.h"
-#include "lib/signal_manager.h"
#include "lib/internet.h"
+#include "lib/signal_manager.h"
+#include "lib/util.h"
#include <dcp/raw_convert.h>
#include <curl/curl.h>
#include <zip.h>
-#include <iostream>
-using std::string;
-using std::cout;
+using std::function;
using std::list;
-using boost::function;
+using std::string;
using boost::optional;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
auto i = urls.begin ();
auto j = files.begin ();
while (!ok && i != urls.end ()) {
- auto error = get_from_zip_url (*i++, *j++, true, true, boost::bind(&DownloadCertificatePanel::load_certificate, this, _1));
+ auto error = get_from_zip_url (*i++, *j++, true, true, boost::bind(&DownloadCertificatePanel::load_certificate, this, _1, _2));
if (error) {
errors.push_back (error.get ());
} else {