projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op: remove all trailing whitespace.
[dcpomatic.git]
/
src
/
lib
/
cinema.h
diff --git
a/src/lib/cinema.h
b/src/lib/cinema.h
index 74357f65d687e0261ded537e94b3b4f95afcfdb2..fea4f1c149362ebbc944a8dc1bb547ccb9943b0c 100644
(file)
--- a/
src/lib/cinema.h
+++ b/
src/lib/cinema.h
@@
-21,9
+21,9
@@
* @brief Screen and Cinema classes.
*/
* @brief Screen and Cinema classes.
*/
-#include <boost/enable_shared_from_this.hpp>
-#include <dcp/certificates.h>
#include <libcxml/cxml.h>
#include <libcxml/cxml.h>
+#include <dcp/certificates.h>
+#include <boost/enable_shared_from_this.hpp>
class Cinema;
class Cinema;
@@
-36,7
+36,7
@@
class Cinema;
class Screen
{
public:
class Screen
{
public:
- Screen (std::string const & n, boost::
shared_ptr
<dcp::Certificate> cert)
+ Screen (std::string const & n, boost::
optional
<dcp::Certificate> cert)
: name (n)
, certificate (cert)
{}
: name (n)
, certificate (cert)
{}
@@
-44,10
+44,10
@@
public:
Screen (cxml::ConstNodePtr);
void as_xml (xmlpp::Element *) const;
Screen (cxml::ConstNodePtr);
void as_xml (xmlpp::Element *) const;
-
+
boost::shared_ptr<Cinema> cinema;
std::string name;
boost::shared_ptr<Cinema> cinema;
std::string name;
- boost::
shared_ptr
<dcp::Certificate> certificate;
+ boost::
optional
<dcp::Certificate> certificate;
};
/** @class Cinema
};
/** @class Cinema
@@
-72,13
+72,13
@@
public:
void add_screen (boost::shared_ptr<Screen>);
void remove_screen (boost::shared_ptr<Screen>);
void add_screen (boost::shared_ptr<Screen>);
void remove_screen (boost::shared_ptr<Screen>);
-
+
std::string name;
std::string email;
std::list<boost::shared_ptr<Screen> > screens () const {
return _screens;
}
std::string name;
std::string email;
std::list<boost::shared_ptr<Screen> > screens () const {
return _screens;
}
-private:
+private:
std::list<boost::shared_ptr<Screen> > _screens;
};
std::list<boost::shared_ptr<Screen> > _screens;
};