projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow move construction of ActiveText.
[dcpomatic.git]
/
src
/
lib
/
spl.cc
diff --git
a/src/lib/spl.cc
b/src/lib/spl.cc
index 7692df0cab1680d9800423c629eed32003e6e5db..3e5e957ff457792257e37c243add266e2feb4524 100644
(file)
--- a/
src/lib/spl.cc
+++ b/
src/lib/spl.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2018-20
19
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2018-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,22
+18,24
@@
*/
*/
+
#include "content_store.h"
#include "spl.h"
#include "content_store.h"
#include "spl.h"
-#include "warnings.h"
#include <libcxml/cxml.h>
#include <dcp/raw_convert.h>
#include <libcxml/cxml.h>
#include <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
#include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
-#include <boost/foreach.hpp>
+LIBDCP_ENABLE_WARNINGS
#include <iostream>
#include <iostream>
+
using std::cout;
using std::string;
using std::cout;
using std::string;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
using dcp::raw_convert;
using dcp::raw_convert;
+
void
SPL::read (boost::filesystem::path path, ContentStore* store)
{
void
SPL::read (boost::filesystem::path path, ContentStore* store)
{
@@
-43,8
+45,8
@@
SPL::read (boost::filesystem::path path, ContentStore* store)
doc.read_file (path);
_id = doc.string_child("Id");
_name = doc.string_child("Name");
doc.read_file (path);
_id = doc.string_child("Id");
_name = doc.string_child("Name");
-
BOOST_FOREACH (cxml::ConstNodePtr i,
doc.node_children("Entry")) {
-
shared_ptr<Content>
c = store->get(i->string_child("Digest"));
+
for (auto i:
doc.node_children("Entry")) {
+
auto
c = store->get(i->string_child("Digest"));
if (c) {
add (SPLEntry(c));
} else {
if (c) {
add (SPLEntry(c));
} else {
@@
-53,14
+55,15
@@
SPL::read (boost::filesystem::path path, ContentStore* store)
}
}
}
}
+
void
SPL::write (boost::filesystem::path path) const
{
xmlpp::Document doc;
void
SPL::write (boost::filesystem::path path) const
{
xmlpp::Document doc;
-
xmlpp::Element*
root = doc.create_root_node ("SPL");
+
auto
root = doc.create_root_node ("SPL");
root->add_child("Id")->add_child_text (_id);
root->add_child("Name")->add_child_text (_name);
root->add_child("Id")->add_child_text (_id);
root->add_child("Name")->add_child_text (_name);
-
BOOST_FOREACH (SPLEntry i,
_spl) {
+
for (auto i:
_spl) {
i.as_xml (root->add_child("Entry"));
}
doc.write_to_file_formatted (path.string());
i.as_xml (root->add_child("Entry"));
}
doc.write_to_file_formatted (path.string());