refactoring

Author: igagis

src/ruis/style/style_provider.cpp

@@ -83,7 +83,7 @@ void style_provider::set(utki::shared_ref<style_sheet> ss)
 	}
 }
 
-std::shared_ptr<const style_provider::style_value_base> style_provider::get_from_cache(style id) const
+std::shared_ptr<const internal::style_value_base> style_provider::get_from_cache(style id) const
 {
 	auto& w = this->standard_cache[id];
 	auto p = w.lock();
@@ -94,7 +94,7 @@ std::shared_ptr<const style_provider::style_value_base> style_provider::get_from
 	return p;
 }
 
-std::shared_ptr<const style_provider::style_value_base> style_provider::get_from_cache(std::string_view id) const
+std::shared_ptr<const internal::style_value_base> style_provider::get_from_cache(std::string_view id) const
 {
 	auto i = this->user_cache.find(id);
 	if (i == this->user_cache.end()) {
@@ -111,7 +111,7 @@ std::shared_ptr<const style_provider::style_value_base> style_provider::get_from
 
 void style_provider::store_to_cache(
 	style id, //
-	std::weak_ptr<style_value_base> v
+	std::weak_ptr<internal::style_value_base> v
 ) const
 {
 	utki::assert(this->standard_cache[id].expired());
@@ -121,7 +121,7 @@ void style_provider::store_to_cache(
 
 void style_provider::store_to_cache(
 	std::string_view id, //
-	std::weak_ptr<style_value_base> v
+	std::weak_ptr<internal::style_value_base> v
 ) const
 {
 	utki::assert(!utki::contains(this->user_cache, id));

src/ruis/style/style_provider.hpp

@@ -32,57 +32,33 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include "../util/length.hpp"
 
 #include "style_sheet.hpp"
+#include "styled.hpp"
 
 namespace ruis {
 
 namespace res {
 class font;
 } // namespace res
 
-template <typename styled_value_type>
-class styled;
-
 class style_provider
 {
 	template <typename styled_value_type>
 	friend class styled;
 
-	class style_value_base
-	{
-		friend class style_provider;
-
-	protected:
-		virtual void reload(
-			const tml::forest& desc, //
-			const ruis::resource_loader& loader
-		) = 0;
-
-		style_value_base() = default;
-
-	public:
-		style_value_base(const style_value_base&) = delete;
-		style_value_base& operator=(const style_value_base&) = delete;
-
-		style_value_base(style_value_base&&) = delete;
-		style_value_base& operator=(style_value_base&&) = delete;
-
-		virtual ~style_value_base() = default;
-	};
+	mutable utki::enum_array<std::weak_ptr<internal::style_value_base>, style> standard_cache;
+	mutable std::map<std::string, std::weak_ptr<internal::style_value_base>, std::less<>> user_cache;
 
-	mutable utki::enum_array<std::weak_ptr<style_value_base>, style> standard_cache;
-	mutable std::map<std::string, std::weak_ptr<style_value_base>, std::less<>> user_cache;
-
-	std::shared_ptr<const style_value_base> get_from_cache(style id) const;
-	std::shared_ptr<const style_value_base> get_from_cache(std::string_view id) const;
+	std::shared_ptr<const internal::style_value_base> get_from_cache(style id) const;
+	std::shared_ptr<const internal::style_value_base> get_from_cache(std::string_view id) const;
 
 	void store_to_cache(
 		style id, //
-		std::weak_ptr<style_value_base> v
+		std::weak_ptr<internal::style_value_base> v
 	) const;
 
 	void store_to_cache(
 		std::string_view id, //
-		std::weak_ptr<style_value_base> v
+		std::weak_ptr<internal::style_value_base> v
 	) const;
 
 public:
@@ -118,12 +94,6 @@ class style_provider
 	styled<res::font> get_font_face_normal() const;
 };
 
-} // namespace ruis
-
-#include "styled.hpp"
-
-namespace ruis {
-
 template <typename value_type>
 styled<value_type> style_provider::get(style id) const
 {

src/ruis/style/styled.hpp

@@ -23,10 +23,38 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include <concepts>
 
-#include "style_provider.hpp"
+#include <tml/tree.hpp>
+
+#include "../resource_loader.hpp"
 
 namespace ruis {
 
+class style_provider;
+
+namespace internal{
+class style_value_base
+{
+	friend class ruis::style_provider;
+
+protected:
+	virtual void reload(
+		const tml::forest& desc, //
+		const ruis::resource_loader& loader
+	) = 0;
+
+	style_value_base() = default;
+
+public:
+	style_value_base(const style_value_base&) = delete;
+	style_value_base& operator=(const style_value_base&) = delete;
+
+	style_value_base(style_value_base&&) = delete;
+	style_value_base& operator=(style_value_base&&) = delete;
+
+	virtual ~style_value_base() = default;
+};
+}
+
 /**
  * @brief A styled value.
  * This class is used to represent a value which can be either a direct value or a reference to a style value.
@@ -53,7 +81,7 @@ class styled
 		>;
 
 private:
-	class style_value : public style_provider::style_value_base
+	class style_value : public internal::style_value_base
 	{
 		template <typename checked_type, typename = void>
 		struct has_static_member_make_from : public std::false_type {};