C++11 tidying.

[dcpomatic.git] / src / lib / font.cc

diff --git a/src/lib/font.cc b/src/lib/font.cc
index 5cf30a2aae370704d985fc6fe31c102f0fcfaad3..a2dc1945f009a8facb973bd5eec19d51f256e373 100644 (file)
--- a/src/lib/font.cc
+++ b/src/lib/font.cc
@@ -1,43 +1,71 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
+#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"))
-       , file (node->optional_string_child ("File"))
+       : _id (node->string_child("Id"))
 {
-       
+       for (auto i: node->node_children("File")) {
+               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);
-       if (file) {
-               node->add_child("File")->add_child_text (file.get().string ());
+       node->add_child("Id")->add_child_text(_id);
+       if (_file) {
+               node->add_child("File")->add_child_text(_file->string());
        }
 }
 
+
+bool
+dcpomatic::operator== (Font const & a, Font const & b)
+{
+       if (a.id() != b.id()) {
+               return false;
+       }
+
+       return a.file() == b.file();
+}
+
+
 bool
-operator!= (Font const & a, Font const & b)
+dcpomatic::operator!= (Font const & a, Font const & b)
 {
-       return (a.id != b.id || a.file != b.file);
+       return !(a == b);
 }