projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
isdcf_metadata.h
diff --git
a/src/lib/isdcf_metadata.h
b/src/lib/isdcf_metadata.h
index 0fb7e7baa0e1292468e0573d5d7424e7e7c165b2..e63f290e47de854ed9347433739eafc57564015d 100644
(file)
--- a/
src/lib/isdcf_metadata.h
+++ b/
src/lib/isdcf_metadata.h
@@
-22,10
+22,7
@@
#include <string>
#include <libxml++/libxml++.h>
#include <string>
#include <libxml++/libxml++.h>
-
-namespace cxml {
- class Node;
-}
+#include <libcxml/cxml.h>
class ISDCFMetadata
{
class ISDCFMetadata
{
@@
-38,7
+35,7
@@
public:
, two_d_version_of_three_d (false)
{}
, two_d_version_of_three_d (false)
{}
- ISDCFMetadata (
boost::shared_ptr<const cxml::Node>
);
+ ISDCFMetadata (
cxml::ConstNodePtr
);
void as_xml (xmlpp::Node *) const;
void read_old_metadata (std::string, std::string);
void as_xml (xmlpp::Node *) const;
void read_old_metadata (std::string, std::string);