diff options
Diffstat (limited to 'src/ThemeBuilder')
25 files changed, 28 insertions, 28 deletions
diff --git a/src/ThemeBuilder/components/Editor.h b/src/ThemeBuilder/components/Editor.h index 29809c82..2e1db741 100644 --- a/src/ThemeBuilder/components/Editor.h +++ b/src/ThemeBuilder/components/Editor.h @@ -1,5 +1,5 @@ #pragma once -#include "cru/common/Event.h" +#include "cru/base/Event.h" #include "cru/ui/components/Component.h" namespace cru::theme_builder::components { diff --git a/src/ThemeBuilder/components/HeadBodyEditor.h b/src/ThemeBuilder/components/HeadBodyEditor.h index 8119724f..1fcf2f63 100644 --- a/src/ThemeBuilder/components/HeadBodyEditor.h +++ b/src/ThemeBuilder/components/HeadBodyEditor.h @@ -1,6 +1,6 @@ #pragma once #include "Editor.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" #include "cru/ui/controls/Container.h" #include "cru/ui/controls/FlexLayout.h" #include "cru/ui/controls/IconButton.h" diff --git a/src/ThemeBuilder/components/StyleRuleSetEditor.cpp b/src/ThemeBuilder/components/StyleRuleSetEditor.cpp index 8cf5af6d..a1c19e08 100644 --- a/src/ThemeBuilder/components/StyleRuleSetEditor.cpp +++ b/src/ThemeBuilder/components/StyleRuleSetEditor.cpp @@ -1,6 +1,6 @@ #include "StyleRuleSetEditor.h" -#include "cru/common/Exception.h" -#include "cru/common/String.h" +#include "cru/base/Exception.h" +#include "cru/base/String.h" #include "cru/ui/DeleteLater.h" #include "cru/ui/ThemeManager.h" #include "cru/ui/controls/FlexLayout.h" diff --git a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp index 64370981..57e72a0f 100644 --- a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp +++ b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp @@ -1,5 +1,5 @@ #include "CheckedConditionEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Condition.h" namespace cru::theme_builder::components::conditions { diff --git a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h index 7cf14912..b6e740f1 100644 --- a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h +++ b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h @@ -1,7 +1,7 @@ #pragma once #include "../properties/CheckBoxPropertyEditor.h" #include "ConditionEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Condition.h" namespace cru::theme_builder::components::conditions { diff --git a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp index a8d5cc87..bf0b1d98 100644 --- a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp +++ b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp @@ -1,5 +1,5 @@ #include "ClickStateConditionEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/helper/ClickDetector.h" #include "cru/ui/style/Condition.h" diff --git a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h index 454a1346..2ea4fcf4 100644 --- a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h +++ b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h @@ -1,8 +1,8 @@ #pragma once #include "../properties/SelectPropertyEditor.h" #include "ConditionEditor.h" -#include "cru/common/ClonablePtr.h" -#include "cru/common/Event.h" +#include "cru/base/ClonablePtr.h" +#include "cru/base/Event.h" #include "cru/ui/style/Condition.h" namespace cru::theme_builder::components::conditions { diff --git a/src/ThemeBuilder/components/conditions/CompoundConditionEditor.cpp b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.cpp index 69b8ed02..8be3aa0f 100644 --- a/src/ThemeBuilder/components/conditions/CompoundConditionEditor.cpp +++ b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.cpp @@ -4,7 +4,7 @@ #include "ConditionEditor.h" #include "FocusConditionEditor.h" #include "NoConditionEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/platform/Color.h" #include "cru/ui/Base.h" #include "cru/ui/ThemeManager.h" diff --git a/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h index e1398514..2948df36 100644 --- a/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h +++ b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h @@ -1,7 +1,7 @@ #pragma once #include "ConditionEditor.h" -#include "cru/common/ClonablePtr.h" -#include "cru/common/Event.h" +#include "cru/base/ClonablePtr.h" +#include "cru/base/Event.h" #include "cru/ui/components/Component.h" #include "cru/ui/components/PopupButton.h" #include "cru/ui/controls/Button.h" diff --git a/src/ThemeBuilder/components/conditions/ConditionEditor.cpp b/src/ThemeBuilder/components/conditions/ConditionEditor.cpp index 5b79c639..421bb028 100644 --- a/src/ThemeBuilder/components/conditions/ConditionEditor.cpp +++ b/src/ThemeBuilder/components/conditions/ConditionEditor.cpp @@ -5,7 +5,7 @@ #include "CompoundConditionEditor.h" #include "FocusConditionEditor.h" #include "NoConditionEditor.h" -#include "cru/common/Exception.h" +#include "cru/base/Exception.h" #include "cru/ui/controls/FlexLayout.h" namespace cru::theme_builder::components::conditions { diff --git a/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp b/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp index 1fb99d64..78c99b5c 100644 --- a/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp +++ b/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp @@ -1,5 +1,5 @@ #include "FocusConditionEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Condition.h" namespace cru::theme_builder::components::conditions { diff --git a/src/ThemeBuilder/components/conditions/FocusConditionEditor.h b/src/ThemeBuilder/components/conditions/FocusConditionEditor.h index 1faf4d7d..d5478653 100644 --- a/src/ThemeBuilder/components/conditions/FocusConditionEditor.h +++ b/src/ThemeBuilder/components/conditions/FocusConditionEditor.h @@ -1,7 +1,7 @@ #pragma once #include "../properties/CheckBoxPropertyEditor.h" #include "ConditionEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Condition.h" namespace cru::theme_builder::components::conditions { diff --git a/src/ThemeBuilder/components/conditions/NoConditionEditor.h b/src/ThemeBuilder/components/conditions/NoConditionEditor.h index 19616319..b38806b5 100644 --- a/src/ThemeBuilder/components/conditions/NoConditionEditor.h +++ b/src/ThemeBuilder/components/conditions/NoConditionEditor.h @@ -1,6 +1,6 @@ #pragma once #include "ConditionEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Condition.h" namespace cru::theme_builder::components::conditions { diff --git a/src/ThemeBuilder/components/properties/MeasureLengthPropertyEditor.cpp b/src/ThemeBuilder/components/properties/MeasureLengthPropertyEditor.cpp index d1f4afce..ad338e78 100644 --- a/src/ThemeBuilder/components/properties/MeasureLengthPropertyEditor.cpp +++ b/src/ThemeBuilder/components/properties/MeasureLengthPropertyEditor.cpp @@ -1,5 +1,5 @@ #include "MeasureLengthPropertyEditor.h" -#include "cru/common/Format.h" +#include "cru/base/Format.h" #include "cru/ui/mapper/MapperRegistry.h" #include "cru/ui/render/MeasureRequirement.h" diff --git a/src/ThemeBuilder/components/properties/PointPropertyEditor.cpp b/src/ThemeBuilder/components/properties/PointPropertyEditor.cpp index 6d4277aa..d8487209 100644 --- a/src/ThemeBuilder/components/properties/PointPropertyEditor.cpp +++ b/src/ThemeBuilder/components/properties/PointPropertyEditor.cpp @@ -1,5 +1,5 @@ #include "PointPropertyEditor.h" -#include "cru/common/Format.h" +#include "cru/base/Format.h" #include "cru/ui/mapper/MapperRegistry.h" #include "cru/ui/mapper/PointMapper.h" diff --git a/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp b/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp index 81eb66d3..1329a08a 100644 --- a/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp +++ b/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp @@ -1,5 +1,5 @@ #include "BorderStylerEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/platform/graphics/Brush.h" #include "cru/platform/graphics/Factory.h" #include "cru/platform/gui/UiApplication.h" diff --git a/src/ThemeBuilder/components/stylers/BorderStylerEditor.h b/src/ThemeBuilder/components/stylers/BorderStylerEditor.h index 539262d6..c9435ee9 100644 --- a/src/ThemeBuilder/components/stylers/BorderStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/BorderStylerEditor.h @@ -4,7 +4,7 @@ #include "../properties/OptionalPropertyEditor.h" #include "../properties/ThicknessPropertyEditor.h" #include "StylerEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" namespace cru::theme_builder::components::stylers { class BorderStylerEditor : public StylerEditor { diff --git a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp index 6b8a5033..c8b2a871 100644 --- a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp +++ b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp @@ -6,7 +6,7 @@ #include "MarginStylerEditor.h" #include "PaddingStylerEditor.h" #include "PreferredSizeStylerEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/ThemeManager.h" #include "cru/ui/style/Styler.h" diff --git a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h index 57150e83..91d2bff5 100644 --- a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h @@ -1,6 +1,6 @@ #pragma once #include "StylerEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/DeleteLater.h" #include "cru/ui/components/PopupButton.h" #include "cru/ui/controls/FlexLayout.h" diff --git a/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h b/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h index 8385b7c3..ec51c041 100644 --- a/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h @@ -2,7 +2,7 @@ #include "../Editor.h" #include "../properties/ColorPropertyEditor.h" #include "StylerEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Styler.h" namespace cru::theme_builder::components::stylers { diff --git a/src/ThemeBuilder/components/stylers/FontStylerEditor.h b/src/ThemeBuilder/components/stylers/FontStylerEditor.h index ccd12113..847b0e2a 100644 --- a/src/ThemeBuilder/components/stylers/FontStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/FontStylerEditor.h @@ -2,7 +2,7 @@ #include "../Editor.h" #include "../properties/FontPropertyEditor.h" #include "StylerEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Styler.h" namespace cru::theme_builder::components::stylers { diff --git a/src/ThemeBuilder/components/stylers/MarginStylerEditor.h b/src/ThemeBuilder/components/stylers/MarginStylerEditor.h index 9de6f1a2..9a1ca750 100644 --- a/src/ThemeBuilder/components/stylers/MarginStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/MarginStylerEditor.h @@ -1,7 +1,7 @@ #pragma once #include "../properties/ThicknessPropertyEditor.h" #include "StylerEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Styler.h" namespace cru::theme_builder::components::stylers { diff --git a/src/ThemeBuilder/components/stylers/PaddingStylerEditor.h b/src/ThemeBuilder/components/stylers/PaddingStylerEditor.h index b78d310b..69565cad 100644 --- a/src/ThemeBuilder/components/stylers/PaddingStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/PaddingStylerEditor.h @@ -1,7 +1,7 @@ #pragma once #include "../properties/ThicknessPropertyEditor.h" #include "StylerEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Styler.h" namespace cru::theme_builder::components::stylers { diff --git a/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.h b/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.h index 4a64da10..36fdc3d6 100644 --- a/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.h +++ b/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.h @@ -1,7 +1,7 @@ #pragma once #include "../properties/MeasureLengthPropertyEditor.h" #include "StylerEditor.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Styler.h" namespace cru::theme_builder::components::stylers { diff --git a/src/ThemeBuilder/main.cpp b/src/ThemeBuilder/main.cpp index 0c5b2159..4f4ffe4a 100644 --- a/src/ThemeBuilder/main.cpp +++ b/src/ThemeBuilder/main.cpp @@ -1,5 +1,5 @@ #include "components/MainWindow.h" -#include "cru/common/io/Resource.h" +#include "cru/base/io/Resource.h" #include "cru/platform/bootstrap/Bootstrap.h" #include "cru/ui/ThemeManager.h" #include "cru/ui/ThemeResourceDictionary.h" |