Hide Font members behind accessors.

5 files changed, 31 insertions, 18 deletions

diff --git a/src/lib/font.cc b/src/lib/font.cc
index 5cf30a2aa..0e1ad85cd 100644
--- a/src/lib/font.cc
+++ b/src/lib/font.cc
@@ -21,8 +21,8 @@
 #include <libxml++/libxml++.h>
 
 Font::Font (cxml::NodePtr node)
-	: id (node->string_child ("Id"))
-	, file (node->optional_string_child ("File"))
+	: _id (node->string_child ("Id"))
+	, _file (node->optional_string_child ("File"))
 {
 	
 }
@@ -30,14 +30,14 @@ Font::Font (cxml::NodePtr node)
 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.get().string ());
 	}
 }
 
 bool
 operator!= (Font const & a, Font const & b)
 {
-	return (a.id != b.id || a.file != b.file);
+	return (a.id() != b.id() || a.file() != b.file());
 }
diff --git a/src/lib/font.h b/src/lib/font.h
index 8021ab5bc..0dedf7e49 100644
--- a/src/lib/font.h
+++ b/src/lib/font.h
@@ -28,16 +28,29 @@
 class Font
 {
 public:
-	Font (std::string id_)
-		: id (id_) {}
+	Font (std::string id)
+		: _id (id) {}
 
 	Font (cxml::NodePtr node);
 
 	void as_xml (xmlpp::Node* node);
-	
+
+	std::string id () const {
+		return _id;
+	}
+
+	boost::optional<boost::filesystem::path> file () const {
+		return _file;
+	}
+
+	void set_file (boost::filesystem::path file) {
+		_file = file;
+	}
+
+private:	
 	/** Font ID, used to describe it in the subtitle content */
-	std::string id;
-	boost::optional<boost::filesystem::path> file;
+	std::string _id;
+	boost::optional<boost::filesystem::path> _file;
 };
 
 bool
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 7e47c317e..289f10c42 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -521,7 +521,7 @@ Writer::finish ()
 
 		/* Add all the fonts to the subtitle content */
 		BOOST_FOREACH (shared_ptr<Font> i, _fonts) {
-			_subtitle_asset->add_font (i->id, i->file.get_value_or (liberation));
+			_subtitle_asset->add_font (i->id(), i->file().get_value_or (liberation));
 		}
 
 		if (dynamic_pointer_cast<dcp::InteropSubtitleAsset> (_subtitle_asset)) {
diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc
index 22078dafd..aa9fd1540 100644
--- a/src/wx/fonts_dialog.cc
+++ b/src/wx/fonts_dialog.cc
@@ -93,9 +93,9 @@ FontsDialog::setup ()
 		wxListItem item;
 		item.SetId (n);
 		_fonts->InsertItem (item);
-		_fonts->SetItem (n, 0, std_to_wx ((*i)->id));
-		if ((*i)->file) {
-			_fonts->SetItem (n, 1, (*i)->file.get().leaf().string ());
+		_fonts->SetItem (n, 0, std_to_wx ((*i)->id ()));
+		if ((*i)->file ()) {
+			_fonts->SetItem (n, 1, (*i)->file().get().leaf().string ());
 		}
 		++n;
 	}
@@ -129,8 +129,8 @@ FontsDialog::set_file_clicked ()
 
 	list<shared_ptr<Font> > fonts = content->fonts ();
 	for (list<shared_ptr<Font> >::iterator i = fonts.begin(); i != fonts.end(); ++i) {
-		if ((*i)->id == id) {
-			(*i)->file = wx_to_std (d->GetPath ());
+		if ((*i)->id() == id) {
+			(*i)->set_file (wx_to_std (d->GetPath ()));
 		}
 	}
 
diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index 83b4ece84..d27597143 100644
--- a/src/wx/hints_dialog.cc
+++ b/src/wx/hints_dialog.cc
@@ -79,7 +79,7 @@ HintsDialog::film_changed ()
 			shared_ptr<SubtitleContent> s = dynamic_pointer_cast<SubtitleContent> (i);
 			if (s) {
 				BOOST_FOREACH (shared_ptr<Font> j, s->fonts ()) {
-					if (j->file && boost::filesystem::file_size (j->file.get ()) >= (640 * 1024)) {
+					if (j->file() && boost::filesystem::file_size (j->file().get ()) >= (640 * 1024)) {
 						big_font_files = true;
 					}
 				}