started to implement rudimentary XML reader (implemented expectOneOf function), changed some conventions in the used files (namespaces, include guards), moved anchor class from domain to document package, removed everything that does not work now from the CMakeLists.txt

git-svn-id: file:///var/local/svn/basicwriter@24 daaaf23c-2e50-4459-9457-1e69db5a47bf

1 files changed, 6 insertions, 14 deletions

diff --git a/src/model/GraphNode.cpp b/src/model/GraphNode.cpp
index affc3af..bfb8e63 100644
--- a/src/model/GraphNode.cpp
+++ b/src/model/GraphNode.cpp
@@ -22,21 +22,11 @@
 #include <sstream>
 
 namespace ousia {
+namespace model {
 
-GraphNode::GraphNode() :
-	parent(nullptr)
-{
-	// Do nothing here
-}
-
-GraphNode::GraphNode(std::shared_ptr<GraphNode> parent) :
-	parent(parent)
-{
-	// Do nothing here
-}
-
-GraphNode::GraphNode(const std::string &name, std::shared_ptr<GraphNode> parent) :
-	name(name), parent(parent)
+GraphNode::GraphNode(GraphNodeType type, std::shared_ptr<GraphNode> parent,
+		const std::string &name) :
+	type(type), parent(parent), name(name)
 {
 	// Do nothing here
 }
@@ -52,3 +42,5 @@ const std::string GraphNode::getFullyQualifiedName()
 }
 
 }
+}
+