projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Supporter.
[dcpomatic.git]
/
src
/
wx
/
download_certificate_panel.cc
diff --git
a/src/wx/download_certificate_panel.cc
b/src/wx/download_certificate_panel.cc
index 7b670261b89d53219c9744d72d46a669d4e7be04..6c01b0d3f257da5ce529aaa8a0a0377c54116814 100644
(file)
--- a/
src/wx/download_certificate_panel.cc
+++ b/
src/wx/download_certificate_panel.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014-2015 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.
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
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/>.
*/
*/
@@
-24,6
+25,7
@@
#include <boost/bind.hpp>
using boost::function;
#include <boost/bind.hpp>
using boost::function;
+using boost::optional;
DownloadCertificatePanel::DownloadCertificatePanel (wxWindow* parent, DownloadCertificateDialog* dialog)
: wxPanel (parent, wxID_ANY)
DownloadCertificatePanel::DownloadCertificatePanel (wxWindow* parent, DownloadCertificateDialog* dialog)
: wxPanel (parent, wxID_ANY)
@@
-55,9
+57,8
@@
DownloadCertificatePanel::load (boost::filesystem::path file)
}
}
}
}
-dcp::Certificate
+optional<dcp::Certificate>
DownloadCertificatePanel::certificate () const
{
DownloadCertificatePanel::certificate () const
{
- DCPOMATIC_ASSERT (_certificate);
- return _certificate.get ();
+ return _certificate;
}
}