summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndreas Stöckel <astoecke@techfak.uni-bielefeld.de>2015-01-02 16:20:29 +0100
committerAndreas Stöckel <andreas@somweyr.de>2015-01-02 16:20:29 +0100
commit5fa382a69c069be1b609e3c5c7b21ef747ceedd2 (patch)
tree57ff1447548afc33aedb77d2022e096d4a643283 /src
parent128ac91adfdab4a21836c4f19d7024dba9790f9e (diff)
Moved Node class to model folder
Diffstat (limited to 'src')
-rw-r--r--src/core/CSS.hpp3
-rw-r--r--src/core/model/Document.hpp2
-rw-r--r--src/core/model/Domain.hpp2
-rw-r--r--src/core/model/Node.cpp (renamed from src/core/Node.cpp)0
-rw-r--r--src/core/model/Node.hpp (renamed from src/core/Node.hpp)0
-rw-r--r--src/core/model/Typesystem.hpp3
-rw-r--r--src/core/parser/Parser.hpp2
-rw-r--r--src/core/parser/Scope.hpp2
8 files changed, 7 insertions, 7 deletions
diff --git a/src/core/CSS.hpp b/src/core/CSS.hpp
index cd80091..60aa91e 100644
--- a/src/core/CSS.hpp
+++ b/src/core/CSS.hpp
@@ -25,8 +25,7 @@
#include <core/common/Variant.hpp>
#include <core/managed/Managed.hpp>
-
-#include "Node.hpp"
+#include <core/model/Node.hpp>
namespace ousia {
diff --git a/src/core/model/Document.hpp b/src/core/model/Document.hpp
index 7d24161..2d792c5 100644
--- a/src/core/model/Document.hpp
+++ b/src/core/model/Document.hpp
@@ -69,9 +69,9 @@
#define _OUSIA_MODEL_DOCUMENT_HPP_
#include <core/managed/ManagedContainer.hpp>
-#include <core/Node.hpp>
#include <core/common/Variant.hpp>
+#include "Node.hpp"
#include "Domain.hpp"
#include "Typesystem.hpp"
diff --git a/src/core/model/Domain.hpp b/src/core/model/Domain.hpp
index 31786c1..1ebe5c6 100644
--- a/src/core/model/Domain.hpp
+++ b/src/core/model/Domain.hpp
@@ -83,9 +83,9 @@
#define _OUSIA_MODEL_DOMAIN_HPP_
#include <core/managed/ManagedContainer.hpp>
-#include <core/Node.hpp>
#include <core/RangeSet.hpp>
+#include "Node.hpp"
#include "Typesystem.hpp"
namespace ousia {
diff --git a/src/core/Node.cpp b/src/core/model/Node.cpp
index fa6a3a2..fa6a3a2 100644
--- a/src/core/Node.cpp
+++ b/src/core/model/Node.cpp
diff --git a/src/core/Node.hpp b/src/core/model/Node.hpp
index cca33f7..cca33f7 100644
--- a/src/core/Node.hpp
+++ b/src/core/model/Node.hpp
diff --git a/src/core/model/Typesystem.hpp b/src/core/model/Typesystem.hpp
index 3a91895..a4322c4 100644
--- a/src/core/model/Typesystem.hpp
+++ b/src/core/model/Typesystem.hpp
@@ -32,12 +32,13 @@
#include <map>
#include <vector>
-#include <core/Node.hpp>
#include <core/common/Exceptions.hpp>
#include <core/common/Logger.hpp>
#include <core/common/Rtti.hpp>
#include <core/common/Variant.hpp>
+#include "Node.hpp"
+
namespace ousia {
namespace model {
diff --git a/src/core/parser/Parser.hpp b/src/core/parser/Parser.hpp
index 867ea1d..63c57c3 100644
--- a/src/core/parser/Parser.hpp
+++ b/src/core/parser/Parser.hpp
@@ -32,11 +32,11 @@
#include <set>
#include <string>
-#include <core/Node.hpp>
#include <core/Registry.hpp>
#include <core/common/CharReader.hpp>
#include <core/common/Exceptions.hpp>
#include <core/common/Logger.hpp>
+#include <core/model/Node.hpp>
#include "Scope.hpp"
diff --git a/src/core/parser/Scope.hpp b/src/core/parser/Scope.hpp
index 5b19b3d..ac0f1fd 100644
--- a/src/core/parser/Scope.hpp
+++ b/src/core/parser/Scope.hpp
@@ -21,7 +21,7 @@
#include <deque>
-#include <core/Node.hpp>
+#include <core/model/Node.hpp>
/**
* @file Scope.hpp