diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-29 09:14:20 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-29 20:53:49 +0200 |
| commit | 39fb8198febde1937019db1c300ec363aab5aa56 (patch) | |
| tree | 52bc32134e8ae2b5587b3a62130baa9acf815b60 /src/lib/font.cc | |
| parent | b249700e1da7dd6631a8b4440587f4093a2bdef1 (diff) | |
C++11 tidying.
Diffstat (limited to 'src/lib/font.cc')
| -rw-r--r-- | src/lib/font.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/lib/font.cc b/src/lib/font.cc index aa9a8aaef..a2dc1945f 100644 --- a/src/lib/font.cc +++ b/src/lib/font.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net> + Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -18,31 +18,35 @@ */ -#include "font.h" + #include "dcpomatic_assert.h" +#include "font.h" #include "warnings.h" DCPOMATIC_DISABLE_WARNINGS #include <libxml++/libxml++.h> DCPOMATIC_ENABLE_WARNINGS + using std::string; using namespace dcpomatic; + Font::Font (cxml::NodePtr node) - : _id (node->string_child ("Id")) + : _id (node->string_child("Id")) { 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(); } } } + 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()); } @@ -59,6 +63,7 @@ dcpomatic::operator== (Font const & a, Font const & b) return a.file() == b.file(); } + bool dcpomatic::operator!= (Font const & a, Font const & b) { |