FIXME: Remove all use of add_child() from xmlpp.

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

diff --git a/src/lib/cinema.cc b/src/lib/cinema.cc
index 7e13b50aea775ef4900b637e145913aa742c92a8..5614fea573edfb428a8d060812ce4323c4972887 100644 (file)
--- a/src/lib/cinema.cc
+++ b/src/lib/cinema.cc
@@ -25,13 +25,11 @@
 #include <libcxml/cxml.h>
 #include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
-#include <iostream>
 
 
-using std::list;
-using std::string;
-using std::shared_ptr;
 using std::make_shared;
+using std::shared_ptr;
+using std::string;
 using dcp::raw_convert;
 using dcpomatic::Screen;
 
@@ -67,19 +65,19 @@ Cinema::read_screens (cxml::ConstNodePtr node)
 void
 Cinema::as_xml (xmlpp::Element* parent) const
 {
-       parent->add_child("Name")->add_child_text (name);
+       cxml::add_text_child(parent, "Name", name);
 
        for (auto i: emails) {
-               parent->add_child("Email")->add_child_text (i);
+               cxml::add_text_child(parent, "Email", i);
        }
 
-       parent->add_child("Notes")->add_child_text (notes);
+       cxml::add_text_child(parent, "Notes", notes);
 
-       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));
+       cxml::add_text_child(parent, "UTCOffsetHour", raw_convert<string> (_utc_offset_hour));
+       cxml::add_text_child(parent, "UTCOffsetMinute", raw_convert<string> (_utc_offset_minute));
 
        for (auto i: _screens) {
-               i->as_xml (parent->add_child ("Screen"));
+               i->as_xml(cxml::add_child(parent, "Screen"));
        }
 }
 
@@ -93,7 +91,10 @@ Cinema::add_screen (shared_ptr<Screen> s)
 void
 Cinema::remove_screen (shared_ptr<Screen> s)
 {
-       _screens.remove (s);
+       auto iter = std::find(_screens.begin(), _screens.end(), s);
+       if (iter != _screens.end()) {
+               _screens.erase(iter);
+       }
 }
 
 void