From bfafa64765de7a6002c2e84daefc84811278a51a Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Sun, 25 Jan 2015 18:54:40 +0100
Subject: more removal of the model namespace

---
 src/plugins/html/DemoOutput.hpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/plugins/html/DemoOutput.hpp')

diff --git a/src/plugins/html/DemoOutput.hpp b/src/plugins/html/DemoOutput.hpp
index b755aac..67b7494 100644
--- a/src/plugins/html/DemoOutput.hpp
+++ b/src/plugins/html/DemoOutput.hpp
@@ -39,7 +39,7 @@
 namespace ousia {
 namespace html {
 
-typedef std::map<std::string, Rooted<model::AnnotationEntity>> AnnoMap;
+typedef std::map<std::string, Rooted<AnnotationEntity>> AnnoMap;
 
 class DemoHTMLTransformer {
 private:
@@ -50,14 +50,14 @@ private:
 	 * called recursively.
 	 */
 	Rooted<xml::Element> transformSection(Handle<xml::Element> parent,
-	                                      Handle<model::StructuredEntity> sec,
+	                                      Handle<StructuredEntity> sec,
 	                                      AnnoMap &startMap, AnnoMap &endMap);
 	/**
 	 * This transforms a list entity, namely ul and ol to an XHTML element.
 	 * For each item, the transformParagraph function is called.
 	 */
 	Rooted<xml::Element> transformList(Handle<xml::Element> parent,
-	                                   Handle<model::StructuredEntity> list,
+	                                   Handle<StructuredEntity> list,
 	                                   AnnoMap &startMap, AnnoMap &endMap);
 	/**
 	 * This transforms a paragraph-like entity, namely heading, item and
@@ -65,7 +65,7 @@ private:
 	 * contained. For anchor handling we require the AnnoMaps.
 	 */
 	Rooted<xml::Element> transformParagraph(Handle<xml::Element> parent,
-	                                        Handle<model::StructuredEntity> par,
+	                                        Handle<StructuredEntity> par,
 	                                        AnnoMap &startMap, AnnoMap &endMap);
 
 public:
@@ -89,7 +89,7 @@ public:
 	 * @param pretty is a flag that manipulates whether newlines and tabs are
 	 *               used.
 	 */
-	void writeHTML(Handle<model::Document> doc, std::ostream &out,
+	void writeHTML(Handle<Document> doc, std::ostream &out,
 	               bool pretty = true);
 };
 }
-- 
cgit v1.2.3