use utki::unique_ref

Author: igagis

examples/basic/src/main.cpp

@@ -3,6 +3,7 @@
 #include <ruis/widget/label/TextLabel.hpp>
 #include <ruis/widget/button/Button.hpp>
 
+// TODO: rewrite
 
 class Application : public ruisapp::application{
 public:

src/ruisapp/application.cpp

@@ -92,9 +92,9 @@ application::~application()
 }
 
 #if CFG_OS_NAME != CFG_OS_NAME_ANDROID && CFG_OS_NAME != CFG_OS_NAME_IOS
-std::unique_ptr<fsif::file> application::get_res_file(std::string_view path) const
+utki::unique_ref<fsif::file> application::get_res_file(std::string_view path) const
 {
-	return std::make_unique<fsif::native_file>(path);
+	return utki::make_unique<fsif::native_file>(path);
 }
 #endif
 

src/ruisapp/application.hpp

@@ -74,7 +74,7 @@ class application : public utki::intrusive_singleton<application>
 	 * @param path - file path to initialize the file interface with.
 	 * @return Instance of the file interface into the resources storage.
 	 */
-	std::unique_ptr<fsif::file> get_res_file(std::string_view path = {}) const;
+	utki::unique_ref<fsif::file> get_res_file(std::string_view path = {}) const;
 
 	/**
 	 * @brief Aggregation of application directory locations.

src/ruisapp/glue/android/application.cxx

@@ -149,12 +149,12 @@ ruisapp::application::application(parameters params) :
 	)
 {}
 
-std::unique_ptr<fsif::file> ruisapp::application::get_res_file(std::string_view path) const
+utki::unique_ref<fsif::file> ruisapp::application::get_res_file(std::string_view path) const
 {
 	utki::assert(globals_wrapper::native_activity, SL);
 	utki::assert(globals_wrapper::native_activity->assetManager, SL);
 
-	return std::make_unique<asset_file>(
+	return utki::make_unique<asset_file>(
 		globals_wrapper::native_activity->assetManager, //
 		path
 	);

src/ruisapp/glue/ios/application.cxx

@@ -129,14 +129,14 @@ ruisapp::application::application(parameters params) :
 	)
 {}
 
-std::unique_ptr<fsif::file> ruisapp::application::get_res_file(std::string_view path) const
+utki::unique_ref<fsif::file> ruisapp::application::get_res_file(std::string_view path) const
 {
 	std::string dir([[[NSBundle mainBundle] resourcePath] fileSystemRepresentation]);
 
 	//	TRACE(<< "res path = " << dir << std::endl)
 
-	auto rdf = std::make_unique<fsif::root_dir>(
-		std::make_unique<fsif::native_file>(), //
+	auto rdf = utki::make_unique<fsif::root_dir>(
+		utki::make_unique<fsif::native_file>(), //
 		dir + "/" // TODO: use utki::cat()?
 	);
 	rdf->set_path(path);

tests/app/src/main.cpp

@@ -72,9 +72,9 @@ class application : public ruisapp::application{
 			this->quit();
 		};
 
-		this->window.gui.init_standard_widgets(*this->get_res_file("../../res/ruis_res/"));
+		this->window.gui.init_standard_widgets(this->get_res_file("../../res/ruis_res/"));
 
-		this->window.gui.context.get().loader().mount_res_pack(*this->get_res_file("res/"));
+		this->window.gui.context.get().loader().mount_res_pack(this->get_res_file("res/"));
 
 		auto c = make_root_widget(this->window.gui.context);
 		this->window.gui.set_root(c);