projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 tidying.
[dcpomatic.git]
/
src
/
wx
/
download_certificate_panel.h
diff --git
a/src/wx/download_certificate_panel.h
b/src/wx/download_certificate_panel.h
index f51bcde133c3ec49f88cfc64306b9e72ddfff32d..ba355f8138c30c3c4aa46ecace7f75a7dc3fbf3d 100644
(file)
--- a/
src/wx/download_certificate_panel.h
+++ b/
src/wx/download_certificate_panel.h
@@
-21,8
+21,11
@@
#ifndef DCPOMATIC_DOWNLOAD_CERTIFICATE_PANEL_H
#define DCPOMATIC_DOWNLOAD_CERTIFICATE_PANEL_H
#ifndef DCPOMATIC_DOWNLOAD_CERTIFICATE_PANEL_H
#define DCPOMATIC_DOWNLOAD_CERTIFICATE_PANEL_H
+#include "lib/warnings.h"
#include <dcp/certificate.h>
#include <dcp/certificate.h>
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/optional.hpp>
class DownloadCertificateDialog;
#include <boost/optional.hpp>
class DownloadCertificateDialog;
@@
-37,7
+40,8
@@
public:
virtual bool ready_to_download () const;
void download ();
virtual bool ready_to_download () const;
void download ();
- boost::optional<std::string> load (boost::filesystem::path);
+ boost::optional<std::string> load_certificate (boost::filesystem::path);
+ boost::optional<std::string> load_certificate_from_chain (boost::filesystem::path);
boost::optional<dcp::Certificate> certificate () const;
protected:
boost::optional<dcp::Certificate> certificate () const;
protected: