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, 25 insertions, 16 deletions

diff --git a/src/model/domain/Domain.hpp b/src/model/domain/Domain.hpp
index dd5ee4d..957ae4a 100644
--- a/src/model/domain/Domain.hpp
+++ b/src/model/domain/Domain.hpp
@@ -16,34 +16,42 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _DOMAIN_HPP_
-#define _DOMAIN_HPP_
+#ifndef _OUSIA_MODEL_DOMAIN_DOMAIN_HPP_
+#define _OUSIA_MODEL_DOMAIN_DOMAIN_HPP_
 
-#include <memory>
-#include <string>
-#include <vector>
+//#include <memory>
+//#include <string>
+//#include <vector>
 
 #include <model/GraphNode.hpp>
 
-#include "Class.hpp"
-#include "Structure.hpp"
-#include "Category.hpp"
-#include "Layer.hpp"
+//#include "Class.hpp"
+//#include "Structure.hpp"
+//#include "Category.hpp"
+//#include "Layer.hpp"
 
 namespace ousia {
+namespace model {
 namespace domain {
 
 class Domain : public GraphNode {
 
 private:
-	std::shared_ptr<Class> root;
-	std::vector<std::shared_ptr<Structure>> structures;
-	std::vector<std::shared_ptr<Category>> categories;
-	std::vector<std::shared_ptr<Layer>> layers;
+//	std::shared_ptr<Class> root;
+//	std::vector<std::shared_ptr<Structure>> structures;
+//	std::vector<std::shared_ptr<Category>> categories;
+//	std::vector<std::shared_ptr<Layer>> layers;
 
 public:
 
-	std::shared_ptr<Class>& getRoot()
+	Domain(std::shared_ptr<GraphNode> parent = nullptr,
+			const std::string &name = "") :
+		GraphNode(GraphNodeType::Domain, parent, name)
+	{
+		// Do nothing here
+	}
+
+/*	std::shared_ptr<Class>& getRoot()
 	{
 		return root;
 	}
@@ -61,12 +69,13 @@ public:
 	std::vector<std::shared_ptr<Layer>>& getLayers()
 	{
 		return layers;
-	}
+	}*/
 
 };
 
 }
 }
+}
 
-#endif /* _DOMAIN_HPP_ */
+#endif /* _OUSIA_MODEL_DOMAIN_DOMAIN_HPP_ */