From 74bb9cd27242b9320f99ff4d2b50c3051576cc14 Mon Sep 17 00:00:00 2001 From: crupest Date: Tue, 8 Feb 2022 16:53:51 +0800 Subject: ... --- src/ui/mapper/BorderStyleMapper.cpp | 16 ++++----- src/ui/mapper/BrushMapper.cpp | 16 ++++----- src/ui/mapper/ColorMapper.cpp | 2 +- src/ui/mapper/CornerRadiusMapper.cpp | 6 ++-- src/ui/mapper/CursorMapper.cpp | 10 +++--- src/ui/mapper/FontMapper.cpp | 6 ++-- src/ui/mapper/Mapper.cpp | 2 +- src/ui/mapper/MapperRegistry.cpp | 40 +++++++++++------------ src/ui/mapper/PointMapper.cpp | 2 +- src/ui/mapper/SizeMapper.cpp | 2 +- src/ui/mapper/ThicknessMapper.cpp | 4 +-- src/ui/mapper/style/AndConditionMapper.cpp | 12 +++---- src/ui/mapper/style/BorderStylerMapper.cpp | 12 +++---- src/ui/mapper/style/ClickStateConditionMapper.cpp | 10 +++--- src/ui/mapper/style/CursorStylerMapper.cpp | 10 +++--- src/ui/mapper/style/FocusConditionMapper.cpp | 8 ++--- src/ui/mapper/style/HoverConditionMapper.cpp | 6 ++-- src/ui/mapper/style/NoConditionMapper.cpp | 6 ++-- src/ui/mapper/style/OrConditionMapper.cpp | 12 +++---- src/ui/mapper/style/StyleRuleMapper.cpp | 16 ++++----- src/ui/mapper/style/StyleRuleSetMapper.cpp | 8 ++--- 21 files changed, 103 insertions(+), 103 deletions(-) (limited to 'src/ui/mapper') diff --git a/src/ui/mapper/BorderStyleMapper.cpp b/src/ui/mapper/BorderStyleMapper.cpp index 1209df07..8daa9d1b 100644 --- a/src/ui/mapper/BorderStyleMapper.cpp +++ b/src/ui/mapper/BorderStyleMapper.cpp @@ -1,11 +1,11 @@ -#include "cru/ui/mapper/BorderStyleMapper.hpp" -#include "../Helper.hpp" -#include "cru/common/Logger.hpp" -#include "cru/platform/graphics/Brush.hpp" -#include "cru/platform/graphics/Factory.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/style/ApplyBorderStyleInfo.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/ui/mapper/BorderStyleMapper.h" +#include "../Helper.h" +#include "cru/common/Logger.h" +#include "cru/platform/graphics/Brush.h" +#include "cru/platform/graphics/Factory.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/style/ApplyBorderStyleInfo.h" +#include "cru/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 bfaef507..737508ce 100644 --- a/src/ui/mapper/BrushMapper.cpp +++ b/src/ui/mapper/BrushMapper.cpp @@ -1,11 +1,11 @@ -#include "cru/ui/mapper/BrushMapper.hpp" -#include "../Helper.hpp" -#include "cru/platform/Color.hpp" -#include "cru/platform/graphics/Brush.hpp" -#include "cru/platform/graphics/Factory.hpp" -#include "cru/ui/mapper/ColorMapper.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/ui/mapper/BrushMapper.h" +#include "../Helper.h" +#include "cru/platform/Color.h" +#include "cru/platform/graphics/Brush.h" +#include "cru/platform/graphics/Factory.h" +#include "cru/ui/mapper/ColorMapper.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/xml/XmlNode.h" #include diff --git a/src/ui/mapper/ColorMapper.cpp b/src/ui/mapper/ColorMapper.cpp index 063b2359..54359727 100644 --- a/src/ui/mapper/ColorMapper.cpp +++ b/src/ui/mapper/ColorMapper.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/mapper/ColorMapper.hpp" +#include "cru/ui/mapper/ColorMapper.h" namespace cru::ui::mapper { bool ColorMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/CornerRadiusMapper.cpp b/src/ui/mapper/CornerRadiusMapper.cpp index 9c8855a3..673432e1 100644 --- a/src/ui/mapper/CornerRadiusMapper.cpp +++ b/src/ui/mapper/CornerRadiusMapper.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/mapper/CornerRadiusMapper.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/mapper/PointMapper.hpp" +#include "cru/ui/mapper/CornerRadiusMapper.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/mapper/PointMapper.h" namespace cru::ui::mapper { bool CornerRadiusMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/CursorMapper.cpp b/src/ui/mapper/CursorMapper.cpp index ad9c2bbf..3a916fd1 100644 --- a/src/ui/mapper/CursorMapper.cpp +++ b/src/ui/mapper/CursorMapper.cpp @@ -1,8 +1,8 @@ -#include "cru/ui/mapper/CursorMapper.hpp" -#include "../Helper.hpp" -#include "cru/common/Exception.hpp" -#include "cru/platform/gui/Cursor.hpp" -#include "cru/platform/gui/UiApplication.hpp" +#include "cru/ui/mapper/CursorMapper.h" +#include "../Helper.h" +#include "cru/common/Exception.h" +#include "cru/platform/gui/Cursor.h" +#include "cru/platform/gui/UiApplication.h" namespace cru::ui::mapper { using cru::platform::gui::ICursor; diff --git a/src/ui/mapper/FontMapper.cpp b/src/ui/mapper/FontMapper.cpp index 26a17c5f..8f64d5aa 100644 --- a/src/ui/mapper/FontMapper.cpp +++ b/src/ui/mapper/FontMapper.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/mapper/FontMapper.hpp" -#include "../Helper.hpp" -#include "cru/platform/graphics/Factory.hpp" +#include "cru/ui/mapper/FontMapper.h" +#include "../Helper.h" +#include "cru/platform/graphics/Factory.h" namespace cru::ui::mapper { bool FontMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/Mapper.cpp b/src/ui/mapper/Mapper.cpp index 93a83d8a..40653118 100644 --- a/src/ui/mapper/Mapper.cpp +++ b/src/ui/mapper/Mapper.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/mapper/Mapper.hpp" +#include "cru/ui/mapper/Mapper.h" #include diff --git a/src/ui/mapper/MapperRegistry.cpp b/src/ui/mapper/MapperRegistry.cpp index 121a65e7..83105b9b 100644 --- a/src/ui/mapper/MapperRegistry.cpp +++ b/src/ui/mapper/MapperRegistry.cpp @@ -1,23 +1,23 @@ -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/mapper/BorderStyleMapper.hpp" -#include "cru/ui/mapper/BrushMapper.hpp" -#include "cru/ui/mapper/ColorMapper.hpp" -#include "cru/ui/mapper/CornerRadiusMapper.hpp" -#include "cru/ui/mapper/CursorMapper.hpp" -#include "cru/ui/mapper/FontMapper.hpp" -#include "cru/ui/mapper/PointMapper.hpp" -#include "cru/ui/mapper/SizeMapper.hpp" -#include "cru/ui/mapper/ThicknessMapper.hpp" -#include "cru/ui/mapper/style/AndConditionMapper.hpp" -#include "cru/ui/mapper/style/BorderStylerMapper.hpp" -#include "cru/ui/mapper/style/ClickStateConditionMapper.hpp" -#include "cru/ui/mapper/style/CursorStylerMapper.hpp" -#include "cru/ui/mapper/style/FocusConditionMapper.hpp" -#include "cru/ui/mapper/style/HoverConditionMapper.hpp" -#include "cru/ui/mapper/style/NoConditionMapper.hpp" -#include "cru/ui/mapper/style/OrConditionMapper.hpp" -#include "cru/ui/mapper/style/StyleRuleMapper.hpp" -#include "cru/ui/mapper/style/StyleRuleSetMapper.hpp" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/mapper/BorderStyleMapper.h" +#include "cru/ui/mapper/BrushMapper.h" +#include "cru/ui/mapper/ColorMapper.h" +#include "cru/ui/mapper/CornerRadiusMapper.h" +#include "cru/ui/mapper/CursorMapper.h" +#include "cru/ui/mapper/FontMapper.h" +#include "cru/ui/mapper/PointMapper.h" +#include "cru/ui/mapper/SizeMapper.h" +#include "cru/ui/mapper/ThicknessMapper.h" +#include "cru/ui/mapper/style/AndConditionMapper.h" +#include "cru/ui/mapper/style/BorderStylerMapper.h" +#include "cru/ui/mapper/style/ClickStateConditionMapper.h" +#include "cru/ui/mapper/style/CursorStylerMapper.h" +#include "cru/ui/mapper/style/FocusConditionMapper.h" +#include "cru/ui/mapper/style/HoverConditionMapper.h" +#include "cru/ui/mapper/style/NoConditionMapper.h" +#include "cru/ui/mapper/style/OrConditionMapper.h" +#include "cru/ui/mapper/style/StyleRuleMapper.h" +#include "cru/ui/mapper/style/StyleRuleSetMapper.h" namespace cru::ui::mapper { MapperRegistry *MapperRegistry::GetInstance() { diff --git a/src/ui/mapper/PointMapper.cpp b/src/ui/mapper/PointMapper.cpp index efafc6ce..ca7729b4 100644 --- a/src/ui/mapper/PointMapper.cpp +++ b/src/ui/mapper/PointMapper.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/mapper/PointMapper.hpp" +#include "cru/ui/mapper/PointMapper.h" namespace cru::ui::mapper { bool PointMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/SizeMapper.cpp b/src/ui/mapper/SizeMapper.cpp index dfc83cca..0fcf1c53 100644 --- a/src/ui/mapper/SizeMapper.cpp +++ b/src/ui/mapper/SizeMapper.cpp @@ -1,4 +1,4 @@ -#include "cru/ui/mapper/SizeMapper.hpp" +#include "cru/ui/mapper/SizeMapper.h" namespace cru::ui::mapper { bool SizeMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/ThicknessMapper.cpp b/src/ui/mapper/ThicknessMapper.cpp index b72f952c..6ddd52ea 100644 --- a/src/ui/mapper/ThicknessMapper.cpp +++ b/src/ui/mapper/ThicknessMapper.cpp @@ -1,5 +1,5 @@ -#include "cru/ui/mapper/ThicknessMapper.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/ui/mapper/ThicknessMapper.h" +#include "cru/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 e07e514c..dd8784d5 100644 --- a/src/ui/mapper/style/AndConditionMapper.cpp +++ b/src/ui/mapper/style/AndConditionMapper.cpp @@ -1,9 +1,9 @@ -#include "cru/ui/mapper/style/AndConditionMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/mapper/style/IConditionMapper.hpp" -#include "cru/ui/style/Condition.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/ui/mapper/style/AndConditionMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/mapper/style/IConditionMapper.h" +#include "cru/ui/style/Condition.h" +#include "cru/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 8a5df83d..95dd28ee 100644 --- a/src/ui/mapper/style/BorderStylerMapper.cpp +++ b/src/ui/mapper/style/BorderStylerMapper.cpp @@ -1,9 +1,9 @@ -#include "cru/ui/mapper/style/BorderStylerMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/style/ApplyBorderStyleInfo.hpp" -#include "cru/ui/style/Styler.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/ui/mapper/style/BorderStylerMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/style/ApplyBorderStyleInfo.h" +#include "cru/ui/style/Styler.h" +#include "cru/xml/XmlNode.h" namespace cru::ui::mapper::style { using cru::ui::style::ApplyBorderStyleInfo; diff --git a/src/ui/mapper/style/ClickStateConditionMapper.cpp b/src/ui/mapper/style/ClickStateConditionMapper.cpp index 8e162a86..7c1200ef 100644 --- a/src/ui/mapper/style/ClickStateConditionMapper.cpp +++ b/src/ui/mapper/style/ClickStateConditionMapper.cpp @@ -1,8 +1,8 @@ -#include "cru/ui/mapper/style/ClickStateConditionMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/common/Exception.hpp" -#include "cru/ui/helper/ClickDetector.hpp" -#include "cru/ui/style/Condition.hpp" +#include "cru/ui/mapper/style/ClickStateConditionMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/common/Exception.h" +#include "cru/ui/helper/ClickDetector.h" +#include "cru/ui/style/Condition.h" namespace cru::ui::mapper::style { bool ClickStateConditionMapper::XmlElementIsOfThisType( diff --git a/src/ui/mapper/style/CursorStylerMapper.cpp b/src/ui/mapper/style/CursorStylerMapper.cpp index c63d451c..103d9d82 100644 --- a/src/ui/mapper/style/CursorStylerMapper.cpp +++ b/src/ui/mapper/style/CursorStylerMapper.cpp @@ -1,8 +1,8 @@ -#include "cru/ui/mapper/style/CursorStylerMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/platform/gui/Cursor.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/style/Styler.hpp" +#include "cru/ui/mapper/style/CursorStylerMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/platform/gui/Cursor.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/style/Styler.h" namespace cru::ui::mapper::style { bool CursorStylerMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/style/FocusConditionMapper.cpp b/src/ui/mapper/style/FocusConditionMapper.cpp index 46f9f2c7..5df4443d 100644 --- a/src/ui/mapper/style/FocusConditionMapper.cpp +++ b/src/ui/mapper/style/FocusConditionMapper.cpp @@ -1,7 +1,7 @@ -#include "cru/common/ClonablePtr.hpp" -#include "cru/ui/mapper/style/FocusConditionMapper.hpp" -#include "cru/ui/style/Condition.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/common/ClonablePtr.h" +#include "cru/ui/mapper/style/FocusConditionMapper.h" +#include "cru/ui/style/Condition.h" +#include "cru/xml/XmlNode.h" namespace cru::ui::mapper::style { bool FocusConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { diff --git a/src/ui/mapper/style/HoverConditionMapper.cpp b/src/ui/mapper/style/HoverConditionMapper.cpp index b78c12e9..4f92e9f6 100644 --- a/src/ui/mapper/style/HoverConditionMapper.cpp +++ b/src/ui/mapper/style/HoverConditionMapper.cpp @@ -1,6 +1,6 @@ -#include "cru/ui/mapper/style/HoverConditionMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/ui/style/Condition.hpp" +#include "cru/ui/mapper/style/HoverConditionMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/ui/style/Condition.h" namespace cru::ui::mapper::style { using namespace cru::ui::style; diff --git a/src/ui/mapper/style/NoConditionMapper.cpp b/src/ui/mapper/style/NoConditionMapper.cpp index 03aae69f..397162f1 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.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/ui/mapper/style/NoConditionMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/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 a91f5130..7b932dbc 100644 --- a/src/ui/mapper/style/OrConditionMapper.cpp +++ b/src/ui/mapper/style/OrConditionMapper.cpp @@ -1,9 +1,9 @@ -#include "cru/ui/mapper/style/OrConditionMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/mapper/style/IConditionMapper.hpp" -#include "cru/ui/style/Condition.hpp" -#include "cru/xml/XmlNode.hpp" +#include "cru/ui/mapper/style/OrConditionMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/mapper/style/IConditionMapper.h" +#include "cru/ui/style/Condition.h" +#include "cru/xml/XmlNode.h" namespace cru::ui::mapper::style { bool OrConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode *node) { diff --git a/src/ui/mapper/style/StyleRuleMapper.cpp b/src/ui/mapper/style/StyleRuleMapper.cpp index fea102ed..1ca45a6e 100644 --- a/src/ui/mapper/style/StyleRuleMapper.cpp +++ b/src/ui/mapper/style/StyleRuleMapper.cpp @@ -1,11 +1,11 @@ -#include "cru/ui/mapper/style/StyleRuleMapper.hpp" -#include "cru/common/ClonablePtr.hpp" -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/mapper/style/IConditionMapper.hpp" -#include "cru/ui/mapper/style/IStylerMapper.hpp" -#include "cru/ui/style/Condition.hpp" -#include "cru/ui/style/StyleRule.hpp" -#include "cru/ui/style/Styler.hpp" +#include "cru/ui/mapper/style/StyleRuleMapper.h" +#include "cru/common/ClonablePtr.h" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/mapper/style/IConditionMapper.h" +#include "cru/ui/mapper/style/IStylerMapper.h" +#include "cru/ui/style/Condition.h" +#include "cru/ui/style/StyleRule.h" +#include "cru/ui/style/Styler.h" namespace cru::ui::mapper::style { using namespace ui::style; diff --git a/src/ui/mapper/style/StyleRuleSetMapper.cpp b/src/ui/mapper/style/StyleRuleSetMapper.cpp index b9199d27..7552e25f 100644 --- a/src/ui/mapper/style/StyleRuleSetMapper.cpp +++ b/src/ui/mapper/style/StyleRuleSetMapper.cpp @@ -1,8 +1,8 @@ -#include "cru/ui/mapper/style/StyleRuleSetMapper.hpp" +#include "cru/ui/mapper/style/StyleRuleSetMapper.h" #include -#include "cru/ui/mapper/MapperRegistry.hpp" -#include "cru/ui/style/StyleRule.hpp" -#include "cru/ui/style/StyleRuleSet.hpp" +#include "cru/ui/mapper/MapperRegistry.h" +#include "cru/ui/style/StyleRule.h" +#include "cru/ui/style/StyleRuleSet.h" namespace cru::ui::mapper::style { using namespace cru::ui::style; -- cgit v1.2.3