aboutsummaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2024-10-06 13:57:39 +0800
committercrupest <crupest@outlook.com>2024-10-06 13:57:39 +0800
commitdfe62dcf8bcefc523b466e127c3edc4dc2756629 (patch)
tree1c751a14ba0da07ca2ff805633f97568060aa4c9 /src/ui
parentf51eb955e188858272230a990565931e7403f23b (diff)
downloadcru-dfe62dcf8bcefc523b466e127c3edc4dc2756629.tar.gz
cru-dfe62dcf8bcefc523b466e127c3edc4dc2756629.tar.bz2
cru-dfe62dcf8bcefc523b466e127c3edc4dc2756629.zip
Rename common to base.
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/ThemeManager.cpp4
-rw-r--r--src/ui/ThemeResourceDictionary.cpp4
-rw-r--r--src/ui/components/Input.cpp2
-rw-r--r--src/ui/controls/Control.cpp2
-rw-r--r--src/ui/controls/RootControl.cpp2
-rw-r--r--src/ui/controls/TextHostControlService.cpp8
-rw-r--r--src/ui/document/TextDocumentElement.cpp2
-rw-r--r--src/ui/helper/ClickDetector.cpp2
-rw-r--r--src/ui/helper/ShortcutHub.cpp2
-rw-r--r--src/ui/host/RoutedEventDispatch.h4
-rw-r--r--src/ui/host/WindowHost.cpp4
-rw-r--r--src/ui/mapper/BorderStyleMapper.cpp2
-rw-r--r--src/ui/mapper/CursorMapper.cpp2
-rw-r--r--src/ui/mapper/style/AndConditionMapper.cpp2
-rw-r--r--src/ui/mapper/style/BorderStylerMapper.cpp2
-rw-r--r--src/ui/mapper/style/CheckedConditionMapper.cpp2
-rw-r--r--src/ui/mapper/style/ClickStateConditionMapper.cpp4
-rw-r--r--src/ui/mapper/style/ContentBrushStylerMapper.cpp2
-rw-r--r--src/ui/mapper/style/CursorStylerMapper.cpp2
-rw-r--r--src/ui/mapper/style/FocusConditionMapper.cpp2
-rw-r--r--src/ui/mapper/style/FontStylerMapper.cpp2
-rw-r--r--src/ui/mapper/style/HoverConditionMapper.cpp2
-rw-r--r--src/ui/mapper/style/NoConditionMapper.cpp2
-rw-r--r--src/ui/mapper/style/OrConditionMapper.cpp2
-rw-r--r--src/ui/mapper/style/StyleRuleMapper.cpp6
-rw-r--r--src/ui/render/BorderRenderObject.cpp2
-rw-r--r--src/ui/render/FlexLayoutRenderObject.cpp2
-rw-r--r--src/ui/render/LayoutHelper.cpp2
-rw-r--r--src/ui/render/RenderObject.cpp4
-rw-r--r--src/ui/render/ScrollBar.cpp2
-rw-r--r--src/ui/render/StackLayoutRenderObject.cpp2
-rw-r--r--src/ui/render/TextRenderObject.cpp2
-rw-r--r--src/ui/style/Condition.cpp4
-rw-r--r--src/ui/style/StyleRuleSet.cpp2
-rw-r--r--src/ui/style/Styler.cpp2
35 files changed, 47 insertions, 47 deletions
diff --git a/src/ui/ThemeManager.cpp b/src/ui/ThemeManager.cpp
index 7358637e..c1b2167e 100644
--- a/src/ui/ThemeManager.cpp
+++ b/src/ui/ThemeManager.cpp
@@ -1,8 +1,8 @@
#include "cru/ui/ThemeManager.h"
#include "Helper.h"
-#include "cru/common/StringUtil.h"
-#include "cru/common/io/Resource.h"
+#include "cru/base/StringUtil.h"
+#include "cru/base/io/Resource.h"
#include "cru/platform/graphics/Brush.h"
#include "cru/platform/graphics/Factory.h"
#include "cru/platform/gui/UiApplication.h"
diff --git a/src/ui/ThemeResourceDictionary.cpp b/src/ui/ThemeResourceDictionary.cpp
index 86a19083..c5986962 100644
--- a/src/ui/ThemeResourceDictionary.cpp
+++ b/src/ui/ThemeResourceDictionary.cpp
@@ -1,6 +1,6 @@
#include "cru/ui/ThemeResourceDictionary.h"
-#include "cru/common/io/CFileStream.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/io/CFileStream.h"
+#include "cru/base/log/Logger.h"
#include "cru/xml/XmlNode.h"
#include "cru/xml/XmlParser.h"
diff --git a/src/ui/components/Input.cpp b/src/ui/components/Input.cpp
index daca68c4..b308ed51 100644
--- a/src/ui/components/Input.cpp
+++ b/src/ui/components/Input.cpp
@@ -1,7 +1,7 @@
#include "cru/ui/components/Input.h"
#include <cmath>
#include <optional>
-#include "cru/common/StringToNumberConverter.h"
+#include "cru/base/StringToNumberConverter.h"
#include "cru/ui/controls/Control.h"
namespace cru::ui::components {
diff --git a/src/ui/controls/Control.cpp b/src/ui/controls/Control.cpp
index 3b0d4be3..17633e3d 100644
--- a/src/ui/controls/Control.cpp
+++ b/src/ui/controls/Control.cpp
@@ -1,6 +1,6 @@
#include "cru/ui/controls/Control.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
#include "cru/platform/gui/Cursor.h"
#include "cru/platform/gui/UiApplication.h"
#include "cru/ui/host/WindowHost.h"
diff --git a/src/ui/controls/RootControl.cpp b/src/ui/controls/RootControl.cpp
index 2d23bb36..1bb2e7ee 100644
--- a/src/ui/controls/RootControl.cpp
+++ b/src/ui/controls/RootControl.cpp
@@ -1,6 +1,6 @@
#include "cru/ui/controls/RootControl.h"
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
#include "cru/platform/gui/Base.h"
#include "cru/platform/gui/Window.h"
#include "cru/ui/Base.h"
diff --git a/src/ui/controls/TextHostControlService.cpp b/src/ui/controls/TextHostControlService.cpp
index 36703986..3e885bd3 100644
--- a/src/ui/controls/TextHostControlService.cpp
+++ b/src/ui/controls/TextHostControlService.cpp
@@ -1,10 +1,10 @@
#include "cru/ui/controls/TextHostControlService.h"
#include "../Helper.h"
-#include "cru/common/Base.h"
-#include "cru/common/String.h"
-#include "cru/common/StringUtil.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/Base.h"
+#include "cru/base/String.h"
+#include "cru/base/StringUtil.h"
+#include "cru/base/log/Logger.h"
#include "cru/platform/graphics/Font.h"
#include "cru/platform/gui/Base.h"
#include "cru/platform/gui/Clipboard.h"
diff --git a/src/ui/document/TextDocumentElement.cpp b/src/ui/document/TextDocumentElement.cpp
index ab79823d..1ba39849 100644
--- a/src/ui/document/TextDocumentElement.cpp
+++ b/src/ui/document/TextDocumentElement.cpp
@@ -1,5 +1,5 @@
#include "cru/ui/document/TextDocumentElement.h"
-#include "cru/common/String.h"
+#include "cru/base/String.h"
#include "cru/ui/document/DocumentElement.h"
#include "cru/ui/document/DocumentElementType.h"
diff --git a/src/ui/helper/ClickDetector.cpp b/src/ui/helper/ClickDetector.cpp
index f76f8af4..de39f14e 100644
--- a/src/ui/helper/ClickDetector.cpp
+++ b/src/ui/helper/ClickDetector.cpp
@@ -1,6 +1,6 @@
#include "cru/ui/helper/ClickDetector.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
#include "cru/ui/DebugFlags.h"
#include "cru/ui/controls/Control.h"
#include "cru/ui/host/WindowHost.h"
diff --git a/src/ui/helper/ShortcutHub.cpp b/src/ui/helper/ShortcutHub.cpp
index 8fbf0b8d..30a563ed 100644
--- a/src/ui/helper/ShortcutHub.cpp
+++ b/src/ui/helper/ShortcutHub.cpp
@@ -1,6 +1,6 @@
#include "cru/ui/helper/ShortcutHub.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
#include "cru/ui/DebugFlags.h"
#include "cru/ui/controls/Control.h"
diff --git a/src/ui/host/RoutedEventDispatch.h b/src/ui/host/RoutedEventDispatch.h
index 5d1c8ce5..207e1ee6 100644
--- a/src/ui/host/RoutedEventDispatch.h
+++ b/src/ui/host/RoutedEventDispatch.h
@@ -1,6 +1,6 @@
#pragma once
-#include "cru/common/SelfResolvable.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/SelfResolvable.h"
+#include "cru/base/log/Logger.h"
#include "cru/ui/DebugFlags.h"
#include "cru/ui/controls/Control.h"
#include "cru/ui/host/WindowHost.h"
diff --git a/src/ui/host/WindowHost.cpp b/src/ui/host/WindowHost.cpp
index 283224b1..616803b6 100644
--- a/src/ui/host/WindowHost.cpp
+++ b/src/ui/host/WindowHost.cpp
@@ -1,8 +1,8 @@
#include "cru/ui/host/WindowHost.h"
#include "RoutedEventDispatch.h"
-#include "cru/common/Base.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/Base.h"
+#include "cru/base/log/Logger.h"
#include "cru/platform/graphics/Painter.h"
#include "cru/platform/gui/InputMethod.h"
#include "cru/platform/gui/UiApplication.h"
diff --git a/src/ui/mapper/BorderStyleMapper.cpp b/src/ui/mapper/BorderStyleMapper.cpp
index 462a07a1..a51651bd 100644
--- a/src/ui/mapper/BorderStyleMapper.cpp
+++ b/src/ui/mapper/BorderStyleMapper.cpp
@@ -1,6 +1,6 @@
#include "cru/ui/mapper/BorderStyleMapper.h"
#include "../Helper.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
#include "cru/platform/graphics/Brush.h"
#include "cru/platform/graphics/Factory.h"
#include "cru/ui/mapper/MapperRegistry.h"
diff --git a/src/ui/mapper/CursorMapper.cpp b/src/ui/mapper/CursorMapper.cpp
index 7de422e8..ed3c91ec 100644
--- a/src/ui/mapper/CursorMapper.cpp
+++ b/src/ui/mapper/CursorMapper.cpp
@@ -1,6 +1,6 @@
#include "cru/ui/mapper/CursorMapper.h"
#include "../Helper.h"
-#include "cru/common/Exception.h"
+#include "cru/base/Exception.h"
#include "cru/platform/gui/Cursor.h"
#include "cru/platform/gui/UiApplication.h"
diff --git a/src/ui/mapper/style/AndConditionMapper.cpp b/src/ui/mapper/style/AndConditionMapper.cpp
index dd8784d5..d57c4927 100644
--- a/src/ui/mapper/style/AndConditionMapper.cpp
+++ b/src/ui/mapper/style/AndConditionMapper.cpp
@@ -1,5 +1,5 @@
#include "cru/ui/mapper/style/AndConditionMapper.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
#include "cru/ui/mapper/MapperRegistry.h"
#include "cru/ui/mapper/style/IConditionMapper.h"
#include "cru/ui/style/Condition.h"
diff --git a/src/ui/mapper/style/BorderStylerMapper.cpp b/src/ui/mapper/style/BorderStylerMapper.cpp
index 95dd28ee..e6e33053 100644
--- a/src/ui/mapper/style/BorderStylerMapper.cpp
+++ b/src/ui/mapper/style/BorderStylerMapper.cpp
@@ -1,5 +1,5 @@
#include "cru/ui/mapper/style/BorderStylerMapper.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
#include "cru/ui/mapper/MapperRegistry.h"
#include "cru/ui/style/ApplyBorderStyleInfo.h"
#include "cru/ui/style/Styler.h"
diff --git a/src/ui/mapper/style/CheckedConditionMapper.cpp b/src/ui/mapper/style/CheckedConditionMapper.cpp
index f61a3d44..74e0a3c5 100644
--- a/src/ui/mapper/style/CheckedConditionMapper.cpp
+++ b/src/ui/mapper/style/CheckedConditionMapper.cpp
@@ -1,4 +1,4 @@
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
#include "cru/ui/mapper/style/CheckedConditionMapper.h"
#include "cru/ui/style/Condition.h"
#include "cru/xml/XmlNode.h"
diff --git a/src/ui/mapper/style/ClickStateConditionMapper.cpp b/src/ui/mapper/style/ClickStateConditionMapper.cpp
index 5b25de2c..d6b403c9 100644
--- a/src/ui/mapper/style/ClickStateConditionMapper.cpp
+++ b/src/ui/mapper/style/ClickStateConditionMapper.cpp
@@ -1,6 +1,6 @@
#include "cru/ui/mapper/style/ClickStateConditionMapper.h"
-#include "cru/common/ClonablePtr.h"
-#include "cru/common/Exception.h"
+#include "cru/base/ClonablePtr.h"
+#include "cru/base/Exception.h"
#include "cru/ui/helper/ClickDetector.h"
#include "cru/ui/style/Condition.h"
diff --git a/src/ui/mapper/style/ContentBrushStylerMapper.cpp b/src/ui/mapper/style/ContentBrushStylerMapper.cpp
index e83f4988..b3571374 100644
--- a/src/ui/mapper/style/ContentBrushStylerMapper.cpp
+++ b/src/ui/mapper/style/ContentBrushStylerMapper.cpp
@@ -1,5 +1,5 @@
#include "cru/ui/mapper/style/ContentBrushStylerMapper.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
#include "cru/platform/graphics/Brush.h"
#include "cru/ui/mapper/MapperRegistry.h"
#include "cru/ui/style/Styler.h"
diff --git a/src/ui/mapper/style/CursorStylerMapper.cpp b/src/ui/mapper/style/CursorStylerMapper.cpp
index 6798798c..3b060c25 100644
--- a/src/ui/mapper/style/CursorStylerMapper.cpp
+++ b/src/ui/mapper/style/CursorStylerMapper.cpp
@@ -1,5 +1,5 @@
#include "cru/ui/mapper/style/CursorStylerMapper.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
#include "cru/platform/gui/Cursor.h"
#include "cru/ui/mapper/MapperRegistry.h"
#include "cru/ui/style/Styler.h"
diff --git a/src/ui/mapper/style/FocusConditionMapper.cpp b/src/ui/mapper/style/FocusConditionMapper.cpp
index b9e89e2e..dfefb921 100644
--- a/src/ui/mapper/style/FocusConditionMapper.cpp
+++ b/src/ui/mapper/style/FocusConditionMapper.cpp
@@ -1,4 +1,4 @@
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
#include "cru/ui/mapper/style/FocusConditionMapper.h"
#include "cru/ui/style/Condition.h"
#include "cru/xml/XmlNode.h"
diff --git a/src/ui/mapper/style/FontStylerMapper.cpp b/src/ui/mapper/style/FontStylerMapper.cpp
index 884832ee..3b1817ac 100644
--- a/src/ui/mapper/style/FontStylerMapper.cpp
+++ b/src/ui/mapper/style/FontStylerMapper.cpp
@@ -1,5 +1,5 @@
#include "cru/ui/mapper/style/FontStylerMapper.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
#include "cru/ui/mapper/MapperRegistry.h"
namespace cru::ui::mapper::style {
diff --git a/src/ui/mapper/style/HoverConditionMapper.cpp b/src/ui/mapper/style/HoverConditionMapper.cpp
index 97767b14..0110edd9 100644
--- a/src/ui/mapper/style/HoverConditionMapper.cpp
+++ b/src/ui/mapper/style/HoverConditionMapper.cpp
@@ -1,5 +1,5 @@
#include "cru/ui/mapper/style/HoverConditionMapper.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
#include "cru/ui/style/Condition.h"
namespace cru::ui::mapper::style {
diff --git a/src/ui/mapper/style/NoConditionMapper.cpp b/src/ui/mapper/style/NoConditionMapper.cpp
index 397162f1..a36e70d2 100644
--- a/src/ui/mapper/style/NoConditionMapper.cpp
+++ b/src/ui/mapper/style/NoConditionMapper.cpp
@@ -1,5 +1,5 @@
#include "cru/ui/mapper/style/NoConditionMapper.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
#include "cru/xml/XmlNode.h"
namespace cru::ui::mapper::style {
diff --git a/src/ui/mapper/style/OrConditionMapper.cpp b/src/ui/mapper/style/OrConditionMapper.cpp
index 7b932dbc..521c57ae 100644
--- a/src/ui/mapper/style/OrConditionMapper.cpp
+++ b/src/ui/mapper/style/OrConditionMapper.cpp
@@ -1,5 +1,5 @@
#include "cru/ui/mapper/style/OrConditionMapper.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
#include "cru/ui/mapper/MapperRegistry.h"
#include "cru/ui/mapper/style/IConditionMapper.h"
#include "cru/ui/style/Condition.h"
diff --git a/src/ui/mapper/style/StyleRuleMapper.cpp b/src/ui/mapper/style/StyleRuleMapper.cpp
index 2ab13c90..2eb5b0a2 100644
--- a/src/ui/mapper/style/StyleRuleMapper.cpp
+++ b/src/ui/mapper/style/StyleRuleMapper.cpp
@@ -1,7 +1,7 @@
#include "cru/ui/mapper/style/StyleRuleMapper.h"
-#include "cru/common/ClonablePtr.h"
-#include "cru/common/Exception.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/ClonablePtr.h"
+#include "cru/base/Exception.h"
+#include "cru/base/log/Logger.h"
#include "cru/ui/mapper/MapperRegistry.h"
#include "cru/ui/mapper/style/IConditionMapper.h"
#include "cru/ui/mapper/style/IStylerMapper.h"
diff --git a/src/ui/render/BorderRenderObject.cpp b/src/ui/render/BorderRenderObject.cpp
index 1392af1e..81a1aa60 100644
--- a/src/ui/render/BorderRenderObject.cpp
+++ b/src/ui/render/BorderRenderObject.cpp
@@ -1,7 +1,7 @@
#include "cru/ui/render/BorderRenderObject.h"
#include "../Helper.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
#include "cru/platform/graphics/Factory.h"
#include "cru/platform/graphics/Geometry.h"
#include "cru/platform/graphics/Painter.h"
diff --git a/src/ui/render/FlexLayoutRenderObject.cpp b/src/ui/render/FlexLayoutRenderObject.cpp
index 988e7590..7bbf9d57 100644
--- a/src/ui/render/FlexLayoutRenderObject.cpp
+++ b/src/ui/render/FlexLayoutRenderObject.cpp
@@ -1,6 +1,6 @@
#include "cru/ui/render/FlexLayoutRenderObject.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
#include "cru/ui/render/LayoutHelper.h"
#include <algorithm>
diff --git a/src/ui/render/LayoutHelper.cpp b/src/ui/render/LayoutHelper.cpp
index a9121321..bbd3c116 100644
--- a/src/ui/render/LayoutHelper.cpp
+++ b/src/ui/render/LayoutHelper.cpp
@@ -1,6 +1,6 @@
#include "cru/ui/render/LayoutHelper.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
namespace cru::ui::render {
float CalculateAnchorByAlignment(Alignment alignment, float start_point,
diff --git a/src/ui/render/RenderObject.cpp b/src/ui/render/RenderObject.cpp
index a370f749..64411036 100644
--- a/src/ui/render/RenderObject.cpp
+++ b/src/ui/render/RenderObject.cpp
@@ -1,7 +1,7 @@
#include "cru/ui/render/RenderObject.h"
-#include "cru/common/Exception.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/Exception.h"
+#include "cru/base/log/Logger.h"
#include "cru/platform/GraphicsBase.h"
#include "cru/ui/DebugFlags.h"
#include "cru/ui/controls/Control.h"
diff --git a/src/ui/render/ScrollBar.cpp b/src/ui/render/ScrollBar.cpp
index 3e578d37..326f7504 100644
--- a/src/ui/render/ScrollBar.cpp
+++ b/src/ui/render/ScrollBar.cpp
@@ -1,7 +1,7 @@
#include "cru/ui/render/ScrollBar.h"
#include "../Helper.h"
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
#include "cru/platform/GraphicsBase.h"
#include "cru/platform/graphics/Factory.h"
#include "cru/platform/graphics/Geometry.h"
diff --git a/src/ui/render/StackLayoutRenderObject.cpp b/src/ui/render/StackLayoutRenderObject.cpp
index 9ca9bf02..d71c5749 100644
--- a/src/ui/render/StackLayoutRenderObject.cpp
+++ b/src/ui/render/StackLayoutRenderObject.cpp
@@ -1,6 +1,6 @@
#include "cru/ui/render/StackLayoutRenderObject.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
#include "cru/ui/render/LayoutHelper.h"
#include "cru/ui/render/MeasureRequirement.h"
diff --git a/src/ui/render/TextRenderObject.cpp b/src/ui/render/TextRenderObject.cpp
index 135c2d02..14e45080 100644
--- a/src/ui/render/TextRenderObject.cpp
+++ b/src/ui/render/TextRenderObject.cpp
@@ -1,7 +1,7 @@
#include "cru/ui/render/TextRenderObject.h"
#include "../Helper.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
#include "cru/platform/graphics/Factory.h"
#include "cru/platform/graphics/Painter.h"
#include "cru/platform/graphics/TextLayout.h"
diff --git a/src/ui/style/Condition.cpp b/src/ui/style/Condition.cpp
index f7cdf7fd..a0de03dc 100644
--- a/src/ui/style/Condition.cpp
+++ b/src/ui/style/Condition.cpp
@@ -1,8 +1,8 @@
#include "cru/ui/style/Condition.h"
#include <memory>
-#include "cru/common/ClonablePtr.h"
-#include "cru/common/Event.h"
+#include "cru/base/ClonablePtr.h"
+#include "cru/base/Event.h"
#include "cru/ui/controls/Control.h"
#include "cru/ui/controls/ICheckableControl.h"
#include "cru/ui/controls/IClickableControl.h"
diff --git a/src/ui/style/StyleRuleSet.cpp b/src/ui/style/StyleRuleSet.cpp
index 7b6454ec..ab3a2d01 100644
--- a/src/ui/style/StyleRuleSet.cpp
+++ b/src/ui/style/StyleRuleSet.cpp
@@ -1,5 +1,5 @@
#include "cru/ui/style/StyleRuleSet.h"
-#include "cru/common/Event.h"
+#include "cru/base/Event.h"
#include "cru/ui/controls/Control.h"
#include "cru/ui/model/IListChangeNotify.h"
diff --git a/src/ui/style/Styler.cpp b/src/ui/style/Styler.cpp
index 3d7ff1f9..a4e3ac25 100644
--- a/src/ui/style/Styler.cpp
+++ b/src/ui/style/Styler.cpp
@@ -1,7 +1,7 @@
#include "cru/ui/style/Styler.h"
#include "../Helper.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
#include "cru/platform/gui/Cursor.h"
#include "cru/platform/gui/UiApplication.h"
#include "cru/ui/controls/Control.h"