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 850236128173958d17be167081513477ce19183b..25271c7701dbb21ab26be7087f9c8bc23520e89f 100644 (file)
--- a/src/wx/download_certificate_panel.h
+++ b/src/wx/download_certificate_panel.h
@@ -1,53 +1,62 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
 #ifndef DCPOMATIC_DOWNLOAD_CERTIFICATE_PANEL_H
 #define DCPOMATIC_DOWNLOAD_CERTIFICATE_PANEL_H
 
+
+#include "lib/warnings.h"
 #include <dcp/certificate.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/optional.hpp>
 
+
 class DownloadCertificateDialog;
 
+
 class DownloadCertificatePanel : public wxPanel
 {
 public:
-       DownloadCertificatePanel (wxWindow* parent, DownloadCertificateDialog* dialog);
+       DownloadCertificatePanel (DownloadCertificateDialog* dialog);
 
-       /* Do any setup that may take a noticeable amount of time */
-       virtual void setup () {}
-       virtual bool ready_to_download () const = 0;
-       virtual void download (wxStaticText* message) = 0;
+       virtual void do_download () = 0;
+       virtual wxString name () const = 0;
+       virtual bool ready_to_download () const;
 
-       void load (boost::filesystem::path);
-       dcp::Certificate certificate () const;
+       void download ();
+       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:
-       void layout ();
-
        DownloadCertificateDialog* _dialog;
        wxFlexGridSizer* _table;
+       wxTextCtrl* _serial;
+       wxSizer* _overall_sizer;
 
 private:
-       wxSizer* _overall_sizer;
        boost::optional<dcp::Certificate> _certificate;
 };
 
+
 #endif