Cleanup: using sorting.

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

diff --git a/src/lib/cinema.cc b/src/lib/cinema.cc
index 48cba2b8fcf58e0e387289c985d1ebed3bfb3a12..57780fa7b859cd456f47052fd9b5d9d9ac065175 100644 (file)
--- a/src/lib/cinema.cc
+++ b/src/lib/cinema.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,26 +18,27 @@
 
 */
 
+
 #include "cinema.h"
 #include "screen.h"
 #include "dcpomatic_assert.h"
 #include <libcxml/cxml.h>
 #include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
-#include <boost/foreach.hpp>
-#include <iostream>
 
-using std::list;
-using std::string;
+
+using std::make_shared;
 using std::shared_ptr;
+using std::string;
 using dcp::raw_convert;
 using dcpomatic::Screen;
 
+
 Cinema::Cinema (cxml::ConstNodePtr node)
        : name (node->string_child ("Name"))
        , notes (node->optional_string_child("Notes").get_value_or(""))
 {
-       BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("Email")) {
+       for (auto i: node->node_children("Email")) {
                emails.push_back (i->content ());
        }
 
@@ -56,9 +57,8 @@ Cinema::Cinema (cxml::ConstNodePtr node)
 void
 Cinema::read_screens (cxml::ConstNodePtr node)
 {
-       list<cxml::NodePtr> s = node->node_children ("Screen");
-       for (list<cxml::NodePtr>::iterator i = s.begin(); i != s.end(); ++i) {
-               add_screen (shared_ptr<Screen> (new Screen (*i)));
+       for (auto i: node->node_children("Screen")) {
+               add_screen (make_shared<Screen>(i));
        }
 }
 
@@ -67,7 +67,7 @@ Cinema::as_xml (xmlpp::Element* parent) const
 {
        parent->add_child("Name")->add_child_text (name);
 
-       BOOST_FOREACH (string i, emails) {
+       for (auto i: emails) {
                parent->add_child("Email")->add_child_text (i);
        }
 
@@ -76,7 +76,7 @@ Cinema::as_xml (xmlpp::Element* parent) const
        parent->add_child("UTCOffsetHour")->add_child_text (raw_convert<string> (_utc_offset_hour));
        parent->add_child("UTCOffsetMinute")->add_child_text (raw_convert<string> (_utc_offset_minute));
 
-       BOOST_FOREACH (shared_ptr<Screen> i, _screens) {
+       for (auto i: _screens) {
                i->as_xml (parent->add_child ("Screen"));
        }
 }