Cleanup: using sorting.

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

diff --git a/src/lib/cinema.cc b/src/lib/cinema.cc
index 42557efc3135c4614fdb1dfbec294b61c71941b4..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,20 +18,22 @@
 
 */
 
+
 #include "cinema.h"
 #include "screen.h"
 #include "dcpomatic_assert.h"
 #include <libcxml/cxml.h>
 #include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
-#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(""))
@@ -55,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));
        }
 }