Fix the build for older macOS.

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

diff --git a/src/lib/dkdm_wrapper.cc b/src/lib/dkdm_wrapper.cc
index 6638bc315bb3936c9e4933abbf3065580c93ecb2..4698c159d26a97bd9dd85cac1edd153334eacc09 100644 (file)
--- a/src/lib/dkdm_wrapper.cc
+++ b/src/lib/dkdm_wrapper.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2017-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "compose.hpp"
 #include "dkdm_wrapper.h"
 #include "dcpomatic_assert.h"
@@ -25,98 +26,86 @@
 DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <boost/foreach.hpp>
+
 
 using std::string;
 using std::list;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::make_shared;
+using std::dynamic_pointer_cast;
+
 
 shared_ptr<DKDMBase>
 DKDMBase::read (cxml::ConstNodePtr node)
 {
        if (node->name() == "DKDM") {
-               return shared_ptr<DKDM> (new DKDM (dcp::EncryptedKDM (node->content ())));
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       } else if (node->name() == "ECinemaDKDM") {
-               return shared_ptr<ECinemaDKDM> (new ECinemaDKDM(EncryptedECinemaKDM(node->content())));
-#endif
+               return make_shared<DKDM>(dcp::EncryptedKDM(node->content()));
        } else if (node->name() == "DKDMGroup") {
-               shared_ptr<DKDMGroup> group (new DKDMGroup (node->string_attribute ("Name")));
-               BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children()) {
-                       shared_ptr<DKDMBase> c = read (i);
-                       if (c) {
+               auto group = make_shared<DKDMGroup>(node->string_attribute("Name"));
+               for (auto i: node->node_children()) {
+                       if (auto c = read(i)) {
                                group->add (c);
                        }
                }
                return group;
        }
 
-       return shared_ptr<DKDMBase> ();
+       return {};
 }
 
+
 string
 DKDM::name () const
 {
        return String::compose ("%1 (%2)", _dkdm.content_title_text(), _dkdm.cpl_id());
 }
 
+
 void
 DKDM::as_xml (xmlpp::Element* node) const
 {
        node->add_child("DKDM")->add_child_text (_dkdm.as_xml ());
 }
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-string
-ECinemaDKDM::name () const
-{
-       return String::compose ("%1 (%2)", _dkdm.name(), _dkdm.id());
-}
-
-void
-ECinemaDKDM::as_xml (xmlpp::Element* node) const
-{
-       node->add_child("ECinemaDKDM")->add_child_text (_dkdm.as_xml());
-}
-#endif
 
 void
 DKDMGroup::as_xml (xmlpp::Element* node) const
 {
-       xmlpp::Element* f = node->add_child("DKDMGroup");
+       auto f = node->add_child("DKDMGroup");
        f->set_attribute ("Name", _name);
-       BOOST_FOREACH (shared_ptr<DKDMBase> i, _children) {
+       for (auto i: _children) {
                i->as_xml (f);
        }
 }
 
+
 void
 DKDMGroup::add (shared_ptr<DKDMBase> child, shared_ptr<DKDM> previous)
 {
        DCPOMATIC_ASSERT (child);
        if (previous) {
-               list<shared_ptr<DKDMBase> >::iterator i = find (_children.begin(), _children.end(), previous);
-               if (i != _children.end ()) {
+               auto i = find (_children.begin(), _children.end(), previous);
+               if (i != _children.end()) {
                        ++i;
                }
                _children.insert (i, child);
        } else {
                _children.push_back (child);
        }
-       child->set_parent (dynamic_pointer_cast<DKDMGroup> (shared_from_this ()));
+       child->set_parent (dynamic_pointer_cast<DKDMGroup>(shared_from_this()));
 }
 
+
 void
 DKDMGroup::remove (shared_ptr<DKDMBase> child)
 {
-       for (list<shared_ptr<DKDMBase> >::iterator i = _children.begin(); i != _children.end(); ++i) {
+       for (auto i = _children.begin(); i != _children.end(); ++i) {
                if (*i == child) {
                        _children.erase (i);
-                       child->set_parent (shared_ptr<DKDMGroup> ());
+                       child->set_parent (shared_ptr<DKDMGroup>());
                        return;
                }
-               shared_ptr<DKDMGroup> g = dynamic_pointer_cast<DKDMGroup> (*i);
+               auto g = dynamic_pointer_cast<DKDMGroup> (*i);
                if (g) {
                        g->remove (child);
                }