diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/core/CSS.hpp | 3 | ||||
| -rw-r--r-- | src/core/model/Document.hpp | 2 | ||||
| -rw-r--r-- | src/core/model/Domain.hpp | 2 | ||||
| -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.hpp | 3 | ||||
| -rw-r--r-- | src/core/parser/Parser.hpp | 2 | ||||
| -rw-r--r-- | src/core/parser/Scope.hpp | 2 | ||||
| -rw-r--r-- | test/core/NodeTest.cpp | 3 |
10 files changed, 9 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 51d30b4..87ac931 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,7 +107,6 @@ ADD_DEFINITIONS( ADD_LIBRARY(ousia_core src/core/CodeTokenizer src/core/CSS - src/core/Node src/core/Registry src/core/ResourceLocator src/core/Tokenizer @@ -125,6 +124,7 @@ ADD_LIBRARY(ousia_core src/core/managed/Manager src/core/model/Document src/core/model/Domain + src/core/model/Node src/core/model/Typesystem src/core/parser/Parser src/core/parser/ParserStack 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 diff --git a/test/core/NodeTest.cpp b/test/core/NodeTest.cpp index d0cf08e..1c58e2c 100644 --- a/test/core/NodeTest.cpp +++ b/test/core/NodeTest.cpp @@ -19,8 +19,7 @@ #include <gtest/gtest.h> #include <core/managed/Managed.hpp> - -#include <core/Node.hpp> +#include <core/model/Node.hpp> namespace ousia { namespace dom { |