From 3b875091c445b7465b9bd044914318989a94d2ad Mon Sep 17 00:00:00 2001 From: Yuqian Yang Date: Fri, 21 Nov 2025 21:43:42 +0800 Subject: Clean codes. Remove member function const. --- .../components/conditions/CheckedConditionEditor.cpp | 3 +-- .../components/conditions/CheckedConditionEditor.h | 6 ++---- .../components/conditions/ClickStateConditionEditor.cpp | 3 +-- .../components/conditions/ClickStateConditionEditor.h | 7 ++----- .../components/conditions/CompoundConditionEditor.h | 12 ------------ .../components/conditions/FocusConditionEditor.cpp | 2 +- .../components/conditions/FocusConditionEditor.h | 6 ++---- 7 files changed, 9 insertions(+), 30 deletions(-) (limited to 'src/ThemeBuilder/components/conditions') diff --git a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp index e207c761..b45006db 100644 --- a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp +++ b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp @@ -14,8 +14,7 @@ CheckedConditionEditor::CheckedConditionEditor() { CheckedConditionEditor::~CheckedConditionEditor() {} -ClonePtr CheckedConditionEditor::GetValue() - const { +ClonePtr CheckedConditionEditor::GetValue() { return ui::style::CheckedCondition::Create(checked_check_box_.GetValue()); } diff --git a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h index c83a1cff..6fc6f97f 100644 --- a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h +++ b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h @@ -11,16 +11,14 @@ class CheckedConditionEditor : public ConditionEditor { ~CheckedConditionEditor() override; public: - ClonePtr GetValue() const; + ClonePtr GetValue(); void SetValue(ui::style::CheckedCondition* value, bool trigger_change = true); void SetValue(const ClonePtr& value, bool trigger_change = true) { SetValue(value.get(), trigger_change); } - ClonePtr GetCondition() override { - return GetValue(); - } + ClonePtr GetCondition() override { return GetValue(); } private: properties::CheckBoxPropertyEditor checked_check_box_; diff --git a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp index 24e83a0e..4862fd47 100644 --- a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp +++ b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp @@ -55,8 +55,7 @@ ClickStateConditionEditor::ClickStateConditionEditor() { ClickStateConditionEditor::~ClickStateConditionEditor() {} -ClonePtr -ClickStateConditionEditor::GetValue() const { +ClonePtr ClickStateConditionEditor::GetValue() { return ui::style::ClickStateCondition::Create( ConvertIndexToClickState(click_state_select_.GetSelectedIndex())); } diff --git a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h index 24d60f7b..6929732c 100644 --- a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h +++ b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h @@ -2,7 +2,6 @@ #include "../properties/SelectPropertyEditor.h" #include "ConditionEditor.h" #include "cru/base/ClonePtr.h" -#include "cru/base/Event.h" #include "cru/ui/style/Condition.h" namespace cru::theme_builder::components::conditions { @@ -12,7 +11,7 @@ class ClickStateConditionEditor : public ConditionEditor { ~ClickStateConditionEditor(); public: - ClonePtr GetValue() const; + ClonePtr GetValue(); void SetValue(ui::style::ClickStateCondition* value, bool trigger_change = true); void SetValue(const ClonePtr& value, @@ -20,9 +19,7 @@ class ClickStateConditionEditor : public ConditionEditor { SetValue(value.get(), trigger_change); } - ClonePtr GetCondition() override { - return GetValue(); - } + ClonePtr GetCondition() override { return GetValue(); } private: properties::SelectPropertyEditor click_state_select_; diff --git a/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h index c0f0891a..6c1beeac 100644 --- a/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h +++ b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h @@ -1,12 +1,8 @@ #pragma once #include "ConditionEditor.h" #include "cru/base/ClonePtr.h" -#include "cru/base/Event.h" -#include "cru/ui/components/Component.h" #include "cru/ui/components/PopupButton.h" -#include "cru/ui/controls/Button.h" #include "cru/ui/controls/FlexLayout.h" -#include "cru/ui/controls/TextBlock.h" #include "cru/ui/style/Condition.h" namespace cru::theme_builder::components::conditions { @@ -27,10 +23,6 @@ class CompoundConditionEditor : public ConditionEditor { }; class AndConditionEditor : public CompoundConditionEditor { - public: - AndConditionEditor() = default; - ~AndConditionEditor() override = default; - public: ClonePtr GetValue() { return ui::style::AndCondition::Create(GetChildren()); @@ -49,10 +41,6 @@ class AndConditionEditor : public CompoundConditionEditor { }; class OrConditionEditor : public CompoundConditionEditor { - public: - OrConditionEditor() = default; - ~OrConditionEditor() override = default; - public: ClonePtr GetValue() { return ui::style::OrCondition::Create(GetChildren()); diff --git a/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp b/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp index 67a660d1..356f42ef 100644 --- a/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp +++ b/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp @@ -14,7 +14,7 @@ FocusConditionEditor::FocusConditionEditor() { FocusConditionEditor::~FocusConditionEditor() {} -ClonePtr FocusConditionEditor::GetValue() const { +ClonePtr FocusConditionEditor::GetValue() { return ui::style::FocusCondition::Create(focus_check_box_.GetValue()); } diff --git a/src/ThemeBuilder/components/conditions/FocusConditionEditor.h b/src/ThemeBuilder/components/conditions/FocusConditionEditor.h index c9c8018e..1cfb883f 100644 --- a/src/ThemeBuilder/components/conditions/FocusConditionEditor.h +++ b/src/ThemeBuilder/components/conditions/FocusConditionEditor.h @@ -11,16 +11,14 @@ class FocusConditionEditor : public ConditionEditor { ~FocusConditionEditor() override; public: - ClonePtr GetValue() const; + ClonePtr GetValue(); void SetValue(ui::style::FocusCondition* value, bool trigger_change = true); void SetValue(const ClonePtr& value, bool trigger_change = true) { SetValue(value.get(), trigger_change); } - ClonePtr GetCondition() override { - return GetValue(); - } + ClonePtr GetCondition() override { return GetValue(); } private: properties::CheckBoxPropertyEditor focus_check_box_; -- cgit v1.2.3