Move xml to base.

18 files changed, 22 insertions, 27 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 959f2dd1..9f9c205f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,6 +3,5 @@ add_subdirectory(platform)
 add_subdirectory(ui)
 add_subdirectory(parse)
 add_subdirectory(toml)
-add_subdirectory(xml)
 
 add_subdirectory(ThemeBuilder)
diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt
index be45d0e0..ef5afe3c 100644
--- a/src/base/CMakeLists.txt
+++ b/src/base/CMakeLists.txt
@@ -14,6 +14,8 @@ add_library(CruBase
 	io/MemoryStream.cpp
 	log/Logger.cpp
 	log/StdioLogTarget.cpp
+	xml/XmlNode.cpp
+	xml/XmlParser.cpp
 )
 target_compile_definitions(CruBase PRIVATE CRU_BASE_EXPORT_API)
 target_include_directories(CruBase PUBLIC ${CRU_INCLUDE_DIR})
diff --git a/src/xml/XmlNode.cpp b/src/base/xml/XmlNode.cpp
index c9b73c50..d3e7369b 100644
--- a/src/xml/XmlNode.cpp
+++ b/src/base/xml/XmlNode.cpp
@@ -1,4 +1,5 @@
-#include "cru/xml/XmlNode.h"
+#include "cru/base/xml/XmlNode.h"
+
 #include <algorithm>
 
 namespace cru::xml {
@@ -66,8 +67,6 @@ XmlNode* XmlElementNode::Clone() const {
   return node;
 }
 
-XmlCommentNode::~XmlCommentNode() {}
-
 XmlNode* XmlCommentNode::Clone() const {
   XmlCommentNode* node = new XmlCommentNode(text_);
 
diff --git a/src/xml/XmlParser.cpp b/src/base/xml/XmlParser.cpp
index 9bfd5441..c35d7a7b 100644
--- a/src/xml/XmlParser.cpp
+++ b/src/base/xml/XmlParser.cpp
@@ -1,6 +1,6 @@
-#include "cru/xml/XmlParser.h"
+#include "cru/base/xml/XmlParser.h"
 #include "cru/base/StringUtil.h"
-#include "cru/xml/XmlNode.h"
+#include "cru/base/xml/XmlNode.h"
 
 namespace cru::xml {
 XmlParser::XmlParser(std::string xml) : xml_(std::move(xml)) {}
@@ -179,7 +179,8 @@ XmlElementNode* XmlParser::DoParse() {
         text += c;
       }
 
-      if (!text.empty()) current_->AddChild(new XmlTextNode(cru::string::TrimEnd(text)));
+      if (!text.empty())
+        current_->AddChild(new XmlTextNode(cru::string::TrimEnd(text)));
     }
   }
 
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 93077388..4dfee0cb 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -79,4 +79,4 @@ add_library(CruUi
 	style/StyleRuleSet.cpp
 )
 target_compile_definitions(CruUi PRIVATE CRU_UI_EXPORT_API)
-target_link_libraries(CruUi PUBLIC CruPlatformGui CruXml)
+target_link_libraries(CruUi PUBLIC CruPlatformGui)
diff --git a/src/ui/ThemeResourceDictionary.cpp b/src/ui/ThemeResourceDictionary.cpp
index b9c7c284..9f734054 100644
--- a/src/ui/ThemeResourceDictionary.cpp
+++ b/src/ui/ThemeResourceDictionary.cpp
@@ -2,8 +2,8 @@
 #include "cru/base/StringUtil.h"
 #include "cru/base/io/CFileStream.h"
 #include "cru/base/log/Logger.h"
-#include "cru/xml/XmlNode.h"
-#include "cru/xml/XmlParser.h"
+#include "cru/base/xml/XmlNode.h"
+#include "cru/base/xml/XmlParser.h"
 
 namespace cru::ui {
 
diff --git a/src/ui/mapper/BorderStyleMapper.cpp b/src/ui/mapper/BorderStyleMapper.cpp
index fa3f672d..d4889457 100644
--- a/src/ui/mapper/BorderStyleMapper.cpp
+++ b/src/ui/mapper/BorderStyleMapper.cpp
@@ -3,7 +3,7 @@
 #include "cru/platform/graphics/Brush.h"
 #include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/style/ApplyBorderStyleInfo.h"
-#include "cru/xml/XmlNode.h"
+#include "cru/base/xml/XmlNode.h"
 
 namespace cru::ui::mapper {
 using namespace xml;
diff --git a/src/ui/mapper/BrushMapper.cpp b/src/ui/mapper/BrushMapper.cpp
index 81eb40a5..4f17bd12 100644
--- a/src/ui/mapper/BrushMapper.cpp
+++ b/src/ui/mapper/BrushMapper.cpp
@@ -5,7 +5,7 @@
 #include "cru/platform/graphics/Brush.h"
 #include "cru/platform/graphics/Factory.h"
 #include "cru/ui/mapper/MapperRegistry.h"
-#include "cru/xml/XmlNode.h"
+#include "cru/base/xml/XmlNode.h"
 
 #include <memory>
 
diff --git a/src/ui/mapper/StringMapper.cpp b/src/ui/mapper/StringMapper.cpp
index 6f6b4546..24b79ff4 100644
--- a/src/ui/mapper/StringMapper.cpp
+++ b/src/ui/mapper/StringMapper.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/mapper/StringMapper.h"
-#include "cru/xml/XmlNode.h"
+#include "cru/base/xml/XmlNode.h"
 
 namespace cru::ui::mapper {
 StringMapper::StringMapper() { SetAllowedTags({"String"}); }
diff --git a/src/ui/mapper/ThicknessMapper.cpp b/src/ui/mapper/ThicknessMapper.cpp
index e6557689..2dc6efdc 100644
--- a/src/ui/mapper/ThicknessMapper.cpp
+++ b/src/ui/mapper/ThicknessMapper.cpp
@@ -1,6 +1,6 @@
 #include "cru/ui/mapper/ThicknessMapper.h"
 #include "cru/base/StringUtil.h"
-#include "cru/xml/XmlNode.h"
+#include "cru/base/xml/XmlNode.h"
 
 namespace cru::ui::mapper {
 bool ThicknessMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
diff --git a/src/ui/mapper/style/AndConditionMapper.cpp b/src/ui/mapper/style/AndConditionMapper.cpp
index c1b7e5e5..0b1fc008 100644
--- a/src/ui/mapper/style/AndConditionMapper.cpp
+++ b/src/ui/mapper/style/AndConditionMapper.cpp
@@ -3,7 +3,7 @@
 #include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/mapper/style/IConditionMapper.h"
 #include "cru/ui/style/Condition.h"
-#include "cru/xml/XmlNode.h"
+#include "cru/base/xml/XmlNode.h"
 
 namespace cru::ui::mapper::style {
 bool AndConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode *node) {
diff --git a/src/ui/mapper/style/BorderStylerMapper.cpp b/src/ui/mapper/style/BorderStylerMapper.cpp
index e93a0af8..3deeed43 100644
--- a/src/ui/mapper/style/BorderStylerMapper.cpp
+++ b/src/ui/mapper/style/BorderStylerMapper.cpp
@@ -3,7 +3,7 @@
 #include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/style/ApplyBorderStyleInfo.h"
 #include "cru/ui/style/Styler.h"
-#include "cru/xml/XmlNode.h"
+#include "cru/base/xml/XmlNode.h"
 
 namespace cru::ui::mapper::style {
 using cru::ui::style::ApplyBorderStyleInfo;
diff --git a/src/ui/mapper/style/CheckedConditionMapper.cpp b/src/ui/mapper/style/CheckedConditionMapper.cpp
index aafc97a4..2d01b4bf 100644
--- a/src/ui/mapper/style/CheckedConditionMapper.cpp
+++ b/src/ui/mapper/style/CheckedConditionMapper.cpp
@@ -2,7 +2,7 @@
 #include "cru/base/ClonablePtr.h"
 #include "cru/base/StringUtil.h"
 #include "cru/ui/style/Condition.h"
-#include "cru/xml/XmlNode.h"
+#include "cru/base/xml/XmlNode.h"
 
 namespace cru::ui::mapper::style {
 bool CheckedConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
diff --git a/src/ui/mapper/style/ContentBrushStylerMapper.cpp b/src/ui/mapper/style/ContentBrushStylerMapper.cpp
index 027622fe..c5caab02 100644
--- a/src/ui/mapper/style/ContentBrushStylerMapper.cpp
+++ b/src/ui/mapper/style/ContentBrushStylerMapper.cpp
@@ -3,7 +3,7 @@
 #include "cru/platform/graphics/Brush.h"
 #include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/style/Styler.h"
-#include "cru/xml/XmlNode.h"
+#include "cru/base/xml/XmlNode.h"
 
 namespace cru::ui::mapper::style {
 ContentBrushStylerMapper::ContentBrushStylerMapper() {
diff --git a/src/ui/mapper/style/FocusConditionMapper.cpp b/src/ui/mapper/style/FocusConditionMapper.cpp
index b21ac250..26a5780d 100644
--- a/src/ui/mapper/style/FocusConditionMapper.cpp
+++ b/src/ui/mapper/style/FocusConditionMapper.cpp
@@ -2,7 +2,7 @@
 #include "cru/base/ClonablePtr.h"
 #include "cru/base/StringUtil.h"
 #include "cru/ui/style/Condition.h"
-#include "cru/xml/XmlNode.h"
+#include "cru/base/xml/XmlNode.h"
 
 namespace cru::ui::mapper::style {
 bool FocusConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
diff --git a/src/ui/mapper/style/NoConditionMapper.cpp b/src/ui/mapper/style/NoConditionMapper.cpp
index d38e187b..84cbf598 100644
--- a/src/ui/mapper/style/NoConditionMapper.cpp
+++ b/src/ui/mapper/style/NoConditionMapper.cpp
@@ -1,6 +1,6 @@
 #include "cru/ui/mapper/style/NoConditionMapper.h"
 #include "cru/base/ClonablePtr.h"
-#include "cru/xml/XmlNode.h"
+#include "cru/base/xml/XmlNode.h"
 
 namespace cru::ui::mapper::style {
 bool NoConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
diff --git a/src/ui/mapper/style/OrConditionMapper.cpp b/src/ui/mapper/style/OrConditionMapper.cpp
index 9c983d83..98b4078d 100644
--- a/src/ui/mapper/style/OrConditionMapper.cpp
+++ b/src/ui/mapper/style/OrConditionMapper.cpp
@@ -3,7 +3,7 @@
 #include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/mapper/style/IConditionMapper.h"
 #include "cru/ui/style/Condition.h"
-#include "cru/xml/XmlNode.h"
+#include "cru/base/xml/XmlNode.h"
 
 namespace cru::ui::mapper::style {
 bool OrConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode *node) {
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
deleted file mode 100644
index 5431d53d..00000000
--- a/src/xml/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-add_library(CruXml
-	XmlNode.cpp
-	XmlParser.cpp
-)
-target_compile_definitions(CruXml PRIVATE CRU_XML_EXPORT_API)
-target_link_libraries(CruXml PUBLIC CruBase)