Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / src / wx / screen_dialog.h

diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h
index 5c6d964b8297681405d501543c14843f463d5253..c88b3bb312170660c710e7ca09c0120fbf424309 100644 (file)
--- a/src/wx/screen_dialog.h
+++ b/src/wx/screen_dialog.h
@@ -17,32 +17,32 @@
 
 */
 
+#include "table_dialog.h"
+#include <dcp/certificate.h>
 #include <wx/wx.h>
 #include <boost/shared_ptr.hpp>
-#include <dcp/certificates.h>
-#include "table_dialog.h"
 
 class Progress;
 
 class ScreenDialog : public TableDialog
 {
 public:
-       ScreenDialog (wxWindow *, std::string, std::string name = "", boost::shared_ptr<dcp::Certificate> c = boost::shared_ptr<dcp::Certificate> ());
+       ScreenDialog (wxWindow *, std::string, std::string name = "", boost::optional<dcp::Certificate> c = boost::optional<dcp::Certificate> ());
 
        std::string name () const;
-       boost::shared_ptr<dcp::Certificate> certificate () const;
-       
+       boost::optional<dcp::Certificate> certificate () const;
+
 private:
        void select_certificate ();
        void load_certificate (boost::filesystem::path);
        void download_certificate ();
        void setup_sensitivity ();
-       
+
        wxTextCtrl* _name;
        wxChoice* _manufacturer;
        wxButton* _load_certificate;
        wxButton* _download_certificate;
        wxTextCtrl* _certificate_text;
 
-       boost::shared_ptr<dcp::Certificate> _certificate;
+       boost::optional<dcp::Certificate> _certificate;
 };