BOOST_FOREACH.

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

diff --git a/src/lib/dkdm_wrapper.cc b/src/lib/dkdm_wrapper.cc
index 6638bc315bb3936c9e4933abbf3065580c93ecb2..74a71966e87b4667e0ab38b4361556a4ac3b89d9 100644 (file)
--- a/src/lib/dkdm_wrapper.cc
+++ b/src/lib/dkdm_wrapper.cc
@@ -25,25 +25,20 @@
 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::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
        } else if (node->name() == "DKDMGroup") {
                shared_ptr<DKDMGroup> group (new DKDMGroup (node->string_attribute ("Name")));
-               BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children()) {
+               for (auto i: node->node_children()) {
                        shared_ptr<DKDMBase> c = read (i);
                        if (c) {
                                group->add (c);
@@ -67,26 +62,12 @@ 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");
        f->set_attribute ("Name", _name);
-       BOOST_FOREACH (shared_ptr<DKDMBase> i, _children) {
+       for (auto i: _children) {
                i->as_xml (f);
        }
 }