diff options
Diffstat (limited to 'src/ui/style')
| -rw-r--r-- | src/ui/style/Condition.cpp | 4 | ||||
| -rw-r--r-- | src/ui/style/StyleRule.cpp | 4 | ||||
| -rw-r--r-- | src/ui/style/Styler.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/ui/style/Condition.cpp b/src/ui/style/Condition.cpp index a0de03dc..abe52edb 100644 --- a/src/ui/style/Condition.cpp +++ b/src/ui/style/Condition.cpp @@ -1,7 +1,7 @@ #include "cru/ui/style/Condition.h" #include <memory> -#include "cru/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/base/Event.h" #include "cru/ui/controls/Control.h" #include "cru/ui/controls/ICheckableControl.h" @@ -10,7 +10,7 @@ namespace cru::ui::style { CompoundCondition::CompoundCondition( - std::vector<ClonablePtr<Condition>> conditions) + std::vector<ClonePtr<Condition>> conditions) : conditions_(std::move(conditions)) {} std::vector<IBaseEvent*> CompoundCondition::ChangeOn( diff --git a/src/ui/style/StyleRule.cpp b/src/ui/style/StyleRule.cpp index 8b9b0a56..bdd0acf2 100644 --- a/src/ui/style/StyleRule.cpp +++ b/src/ui/style/StyleRule.cpp @@ -1,8 +1,8 @@ #include "cru/ui/style/StyleRule.h" namespace cru::ui::style { -StyleRule::StyleRule(ClonablePtr<Condition> condition, - ClonablePtr<Styler> styler, std::string name) +StyleRule::StyleRule(ClonePtr<Condition> condition, + ClonePtr<Styler> styler, std::string name) : condition_(std::move(condition)), styler_(std::move(styler)), name_(std::move(name)) {} diff --git a/src/ui/style/Styler.cpp b/src/ui/style/Styler.cpp index a4e3ac25..8b4405cd 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/base/ClonablePtr.h" +#include "cru/base/ClonePtr.h" #include "cru/platform/gui/Cursor.h" #include "cru/platform/gui/UiApplication.h" #include "cru/ui/controls/Control.h" @@ -20,7 +20,7 @@ void BorderStyler::Apply(controls::Control *control) const { } } -ClonablePtr<CursorStyler> CursorStyler::Create( +ClonePtr<CursorStyler> CursorStyler::Create( platform::gui::SystemCursorType type) { return Create(GetUiApplication()->GetCursorManager()->GetSystemCursor(type)); } |
