projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op: remove all trailing whitespace.
[dcpomatic.git]
/
src
/
lib
/
cinema.cc
diff --git
a/src/lib/cinema.cc
b/src/lib/cinema.cc
index 62023618676a6f83de20bfde5f6be6acd651e1b7..f774392386b7136568b2dbe06e16b1f6e50f7654 100644
(file)
--- a/
src/lib/cinema.cc
+++ b/
src/lib/cinema.cc
@@
-17,9
+17,9
@@
*/
*/
-#include <libxml++/libxml++.h>
-#include <libcxml/cxml.h>
#include "cinema.h"
#include "cinema.h"
+#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
using std::list;
using boost::shared_ptr;
using std::list;
using boost::shared_ptr;
@@
-68,8
+68,8
@@
Cinema::remove_screen (shared_ptr<Screen> s)
}
Screen::Screen (cxml::ConstNodePtr node)
}
Screen::Screen (cxml::ConstNodePtr node)
+ : name (node->string_child ("Name"))
{
{
- name = node->string_child ("Name");
if (node->optional_string_child ("Certificate")) {
certificate = dcp::Certificate (node->string_child ("Certificate"));
}
if (node->optional_string_child ("Certificate")) {
certificate = dcp::Certificate (node->string_child ("Certificate"));
}
@@
-84,4
+84,4
@@
Screen::as_xml (xmlpp::Element* parent) const
}
}
}
}
-
+