Cleanup: replace some list with vector.

[dcpomatic.git] / src / lib / cinema.h

diff --git a/src/lib/cinema.h b/src/lib/cinema.h
index 86245953b85b830d4031b3c5bbec0025a598ef2e..6c202a7bfc0e03515925d67162b90ee5c295995f 100644 (file)
--- a/src/lib/cinema.h
+++ b/src/lib/cinema.h
@@ -22,8 +22,10 @@
  *  @brief Cinema class.
  */
 
+
 #include <libcxml/cxml.h>
-#include <boost/enable_shared_from_this.hpp>
+#include <memory>
+
 
 namespace xmlpp {
        class Element;
@@ -39,10 +41,10 @@ namespace dcpomatic {
  *  This is a cinema name, some metadata and a list of
  *  Screen objects.
  */
-class Cinema : public boost::enable_shared_from_this<Cinema>
+class Cinema : public std::enable_shared_from_this<Cinema>
 {
 public:
-       Cinema (std::string const & name_, std::list<std::string> const & e, std::string notes_, int utc_offset_hour, int utc_offset_minute)
+       Cinema(std::string const & name_, std::vector<std::string> const & e, std::string notes_, int utc_offset_hour, int utc_offset_minute)
                : name (name_)
                , emails (e)
                , notes (notes_)
@@ -56,14 +58,14 @@ public:
 
        void as_xml (xmlpp::Element *) const;
 
-       void add_screen (boost::shared_ptr<dcpomatic::Screen>);
-       void remove_screen (boost::shared_ptr<dcpomatic::Screen>);
+       void add_screen (std::shared_ptr<dcpomatic::Screen>);
+       void remove_screen (std::shared_ptr<dcpomatic::Screen>);
 
        void set_utc_offset_hour (int h);
        void set_utc_offset_minute (int m);
 
        std::string name;
-       std::list<std::string> emails;
+       std::vector<std::string> emails;
        std::string notes;
 
        int utc_offset_hour () const {
@@ -74,12 +76,12 @@ public:
                return _utc_offset_minute;
        }
 
-       std::list<boost::shared_ptr<dcpomatic::Screen> > screens () const {
+       std::vector<std::shared_ptr<dcpomatic::Screen>> screens() const {
                return _screens;
        }
 
 private:
-       std::list<boost::shared_ptr<dcpomatic::Screen> > _screens;
+       std::vector<std::shared_ptr<dcpomatic::Screen>> _screens;
        /** Offset such that the equivalent time in UTC can be determined
            by subtracting the offset from the local time.
        */