Rename some things to ...Node.

3 files changed, 14 insertions, 14 deletions

diff --git a/test/interop_load_font_test.cc b/test/interop_load_font_test.cc
index b5972762..9940c5e0 100644
--- a/test/interop_load_font_test.cc
+++ b/test/interop_load_font_test.cc
@@ -17,14 +17,14 @@
 
 */
 
-#include "interop_load_font.h"
+#include "interop_load_font_node.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/test/unit_test.hpp>
 
 BOOST_AUTO_TEST_CASE (interop_load_font_test1)
 {
-	dcp::InteropLoadFont lf ("my-great-id", "my-great-uri");
+	dcp::InteropLoadFontNode lf ("my-great-id", "my-great-uri");
 	BOOST_CHECK_EQUAL (lf.id, "my-great-id");
 	BOOST_CHECK_EQUAL (lf.uri, "my-great-uri");
 }
@@ -36,7 +36,7 @@ BOOST_AUTO_TEST_CASE (interop_load_font_test2)
 
 	text->set_attribute("Id", "my-great-id");
 	text->set_attribute("URI", "my-great-uri");
-	dcp::InteropLoadFont lf (cxml::ConstNodePtr (new cxml::Node (text)));
+	dcp::InteropLoadFontNode lf (cxml::ConstNodePtr (new cxml::Node (text)));
 
 	BOOST_CHECK_EQUAL (lf.id, "my-great-id");
 }
@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE (interop_load_font_test3)
 
 	text->set_attribute("ID", "my-great-id");
 	text->set_attribute("URI", "my-great-uri");
-	dcp::InteropLoadFont lf (cxml::ConstNodePtr (new cxml::Node (text)));
+	dcp::InteropLoadFontNode lf (cxml::ConstNodePtr (new cxml::Node (text)));
 
 	BOOST_CHECK_EQUAL (lf.id, "my-great-id");
 }
@@ -57,9 +57,9 @@ BOOST_AUTO_TEST_CASE (interop_load_font_test3)
 /** Test operator== and operator!= */
 BOOST_AUTO_TEST_CASE (interop_load_font_test4)
 {
-	dcp::InteropLoadFont A ("my-create-id", "my-great-uri");
-	dcp::InteropLoadFont B ("my-create-id", "my-great-uri");
-	dcp::InteropLoadFont C ("my-create-id", "another-great-uri");
+	dcp::InteropLoadFontNode A ("my-create-id", "my-great-uri");
+	dcp::InteropLoadFontNode B ("my-create-id", "my-great-uri");
+	dcp::InteropLoadFontNode C ("my-create-id", "another-great-uri");
 
 	BOOST_CHECK (A == B);
 	BOOST_CHECK (B != C);
diff --git a/test/smpte_load_font_test.cc b/test/smpte_load_font_test.cc
index 4f9d2128..77020b98 100644
--- a/test/smpte_load_font_test.cc
+++ b/test/smpte_load_font_test.cc
@@ -17,7 +17,7 @@
 
 */
 
-#include "smpte_load_font.h"
+#include "smpte_load_font_node.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/test/unit_test.hpp>
@@ -27,9 +27,9 @@ BOOST_AUTO_TEST_CASE (smpte_load_font_test1)
 	xmlpp::Document doc;
 	xmlpp::Element* text = doc.create_root_node("Font");
 
-	text->set_attribute("ID", "my-great-id");
-	text->add_child_text("urn:uuid:my-great-urn");
-	dcp::SMPTELoadFont lf (cxml::ConstNodePtr (new cxml::Node (text)));
+	text->set_attribute ("ID", "my-great-id");
+	text->add_child_text ("urn:uuid:my-great-urn");
+	dcp::SMPTELoadFontNode lf (cxml::ConstNodePtr (new cxml::Node (text)));
 
 	BOOST_CHECK_EQUAL (lf.id, "my-great-id");
 	BOOST_CHECK_EQUAL (lf.urn, "my-great-urn");
diff --git a/test/text_test.cc b/test/text_test.cc
index 6749a753..8aff4f1d 100644
--- a/test/text_test.cc
+++ b/test/text_test.cc
@@ -17,7 +17,7 @@
 
 */
 
-#include "text.h"
+#include "text_node.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/test/unit_test.hpp>
@@ -31,7 +31,7 @@ BOOST_AUTO_TEST_CASE (text_test1)
 	text->set_attribute("VAlign", "top");
 	text->add_child_text("Hello world");
 
-	dcp::Text t (cxml::NodePtr (new cxml::Node (text)), 250);
+	dcp::TextNode t (cxml::NodePtr (new cxml::Node (text)), 250);
 	BOOST_CHECK_CLOSE (t.v_position, 0.042, 0.001);
 	BOOST_CHECK_EQUAL (t.v_align, dcp::TOP);
 	BOOST_CHECK_EQUAL (t.text, "Hello world");
@@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE (text_test2)
 	text->set_attribute("Valign", "top");
 	text->add_child_text("Hello world");
 
-	dcp::Text t (cxml::NodePtr (new cxml::Node (text)), 250);
+	dcp::TextNode t (cxml::NodePtr (new cxml::Node (text)), 250);
 	BOOST_CHECK_CLOSE (t.v_position, 0.042, 0.001);
 	BOOST_CHECK_EQUAL (t.v_align, dcp::TOP);
 	BOOST_CHECK_EQUAL (t.text, "Hello world");