projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 tidying.
[dcpomatic.git]
/
src
/
lib
/
font.cc
diff --git
a/src/lib/font.cc
b/src/lib/font.cc
index aa9a8aaef7bc39d556f9377351a83cc0a2fbd401..a2dc1945f009a8facb973bd5eec19d51f256e373 100644
(file)
--- a/
src/lib/font.cc
+++ b/
src/lib/font.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,31
+18,35
@@
*/
*/
-#include "font.h"
+
#include "dcpomatic_assert.h"
#include "dcpomatic_assert.h"
+#include "font.h"
#include "warnings.h"
DCPOMATIC_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
DCPOMATIC_ENABLE_WARNINGS
#include "warnings.h"
DCPOMATIC_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
DCPOMATIC_ENABLE_WARNINGS
+
using std::string;
using namespace dcpomatic;
using std::string;
using namespace dcpomatic;
+
Font::Font (cxml::NodePtr node)
Font::Font (cxml::NodePtr node)
- : _id (node->string_child
("Id"))
+ : _id (node->string_child("Id"))
{
for (auto i: node->node_children("File")) {
{
for (auto i: node->node_children("File")) {
- string variant = i->optional_string_attribute("Variant").get_value_or
("Normal");
+ string variant = i->optional_string_attribute("Variant").get_value_or("Normal");
if (variant == "Normal") {
_file = i->content();
}
}
}
if (variant == "Normal") {
_file = i->content();
}
}
}
+
void
Font::as_xml (xmlpp::Node* node)
{
void
Font::as_xml (xmlpp::Node* node)
{
- node->add_child("Id")->add_child_text
(_id);
+ node->add_child("Id")->add_child_text(_id);
if (_file) {
node->add_child("File")->add_child_text(_file->string());
}
if (_file) {
node->add_child("File")->add_child_text(_file->string());
}
@@
-59,6
+63,7
@@
dcpomatic::operator== (Font const & a, Font const & b)
return a.file() == b.file();
}
return a.file() == b.file();
}
+
bool
dcpomatic::operator!= (Font const & a, Font const & b)
{
bool
dcpomatic::operator!= (Font const & a, Font const & b)
{