From 02e6a3c039d7e9d0fa370160bfb8e41f8ce7d061 Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Thu, 29 Feb 2024 18:16:46 +0200 Subject: [PATCH] treeml -> tml --- homebrew/ruisapp.rb.in | 2 +- msvs_solution/libruisapp/libruisapp.vcxproj | 4 +-- msvs_solution/libruisapp/packages.config | 2 +- msvs_solution/tests/packages.config | 2 +- msvs_solution/tests/tests.vcxproj | 4 +-- nuget/nuget.autopkg.in | 2 +- src/makefile | 2 +- tests/app/makefile | 2 +- tests/app/src/main.cpp | 28 ++++++++++----------- xcode/Podfile | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/homebrew/ruisapp.rb.in b/homebrew/ruisapp.rb.in index 74c16e2..7d158a8 100644 --- a/homebrew/ruisapp.rb.in +++ b/homebrew/ruisapp.rb.in @@ -9,7 +9,7 @@ class Ruisapp < Formula depends_on "libutki" depends_on "libpapki" depends_on "libopros" - depends_on "libtreeml" + depends_on "libtml" depends_on "glew" depends_on "libr4" depends_on "libruis" diff --git a/msvs_solution/libruisapp/libruisapp.vcxproj b/msvs_solution/libruisapp/libruisapp.vcxproj index 5c0d322..8586c95 100755 --- a/msvs_solution/libruisapp/libruisapp.vcxproj +++ b/msvs_solution/libruisapp/libruisapp.vcxproj @@ -595,7 +595,7 @@ - + @@ -619,7 +619,7 @@ - + diff --git a/msvs_solution/libruisapp/packages.config b/msvs_solution/libruisapp/packages.config index c41300b..28bcc02 100755 --- a/msvs_solution/libruisapp/packages.config +++ b/msvs_solution/libruisapp/packages.config @@ -16,7 +16,7 @@ - + \ No newline at end of file diff --git a/msvs_solution/tests/packages.config b/msvs_solution/tests/packages.config index c41300b..28bcc02 100755 --- a/msvs_solution/tests/packages.config +++ b/msvs_solution/tests/packages.config @@ -16,7 +16,7 @@ - + \ No newline at end of file diff --git a/msvs_solution/tests/tests.vcxproj b/msvs_solution/tests/tests.vcxproj index 7e67e5f..b98137c 100755 --- a/msvs_solution/tests/tests.vcxproj +++ b/msvs_solution/tests/tests.vcxproj @@ -596,7 +596,7 @@ - + @@ -620,7 +620,7 @@ - + diff --git a/nuget/nuget.autopkg.in b/nuget/nuget.autopkg.in index f837bed..c6c4520 100644 --- a/nuget/nuget.autopkg.in +++ b/nuget/nuget.autopkg.in @@ -37,7 +37,7 @@ nuget{ glew.v140/1.12.0; libpapki/1.0.134; libopros/1.0.91; - libtreeml/0.2.13; + libtml/0.2.13; libutki/1.1.228; }; } diff --git a/src/makefile b/src/makefile index 6fdbe47..f2d5801 100644 --- a/src/makefile +++ b/src/makefile @@ -26,7 +26,7 @@ define ruisapp_rules this_ldlibs += -framework Cocoa -framework OpenGL -ldl endif - this_ldlibs += -lruis -lpapki -ltreeml -lutki + this_ldlibs += -lruis -lpapki -ltml -lutki ifeq ($(os), macosx) this_mm_obj := $$(d)$$(this_out_dir)obj_$$(this_name)/objc/ruisapp/glue/macosx/glue.mm.o diff --git a/tests/app/makefile b/tests/app/makefile index 0794a60..6ad80a0 100644 --- a/tests/app/makefile +++ b/tests/app/makefile @@ -30,7 +30,7 @@ else ifeq ($(os),linux) this_ldflags += -rdynamic endif -this_ldlibs += -ltreeml -lruis -lutki -lpapki -lm +this_ldlibs += -ltml -lruis -lutki -lpapki -lm $(eval $(prorab-build-app)) diff --git a/tests/app/src/main.cpp b/tests/app/src/main.cpp index 01cc1c0..0df5ab1 100644 --- a/tests/app/src/main.cpp +++ b/tests/app/src/main.cpp @@ -45,7 +45,7 @@ class simple_widget : utki::shared_ref tex; public: - simple_widget(const utki::shared_ref& c, const treeml::forest& desc) : + simple_widget(const utki::shared_ref& c, const tml::forest& desc) : ruis::widget(c, desc), ruis::character_input_widget(this->context), tex(this->context.get().loader.load("tex_sample")) @@ -149,7 +149,7 @@ class cube_widget : public ruis::widget, public ruis::updateable{ public: std::shared_ptr cubeVAO; - cube_widget(const utki::shared_ref& c, const treeml::forest& desc) : + cube_widget(const utki::shared_ref& c, const tml::forest& desc) : ruis::widget(c, desc) { // NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers) @@ -243,7 +243,7 @@ class cube_widget : public ruis::widget, public ruis::updateable{ }; class tree_view_items_provider : public ruis::tree_view::provider{ - treeml::forest root; + tml::forest root; utki::shared_ref context; public: @@ -252,7 +252,7 @@ class tree_view_items_provider : public ruis::tree_view::provider{ tree_view_items_provider(const utki::shared_ref& c) : context(c) { - this->root = treeml::read(R"qwertyuiop( + this->root = tml::read(R"qwertyuiop( root1{ subroot1{ subsubroot1 @@ -308,8 +308,8 @@ class tree_view_items_provider : public ruis::tree_view::provider{ return; } - treeml::forest* list = &this->root; - treeml::forest* parent_list = nullptr; + tml::forest* list = &this->root; + tml::forest* parent_list = nullptr; for(auto& i : this->selected_item){ parent_list = list; @@ -320,7 +320,7 @@ class tree_view_items_provider : public ruis::tree_view::provider{ return; } - parent_list->insert(utki::next(parent_list->begin(), this->selected_item.back()), treeml::leaf(this->generate_new_item_value())); + parent_list->insert(utki::next(parent_list->begin(), this->selected_item.back()), tml::leaf(this->generate_new_item_value())); this->notify_item_added(utki::make_span(this->selected_item)); ++this->selected_item.back(); @@ -331,8 +331,8 @@ class tree_view_items_provider : public ruis::tree_view::provider{ return; } - treeml::forest* list = &this->root; - treeml::forest* parent_list = nullptr; + tml::forest* list = &this->root; + tml::forest* parent_list = nullptr; for(auto& i : this->selected_item){ parent_list = list; @@ -343,7 +343,7 @@ class tree_view_items_provider : public ruis::tree_view::provider{ return; } - parent_list->insert(utki::next(parent_list->begin(), this->selected_item.back() + 1), treeml::leaf(this->generate_new_item_value())); + parent_list->insert(utki::next(parent_list->begin(), this->selected_item.back() + 1), tml::leaf(this->generate_new_item_value())); ++this->selected_item.back(); this->notify_item_added(utki::make_span(this->selected_item)); @@ -355,7 +355,7 @@ class tree_view_items_provider : public ruis::tree_view::provider{ return; } - treeml::forest* list = &this->root; + tml::forest* list = &this->root; for(auto& i : this->selected_item){ list = &(*list)[i].children; @@ -374,7 +374,7 @@ class tree_view_items_provider : public ruis::tree_view::provider{ auto list = &this->root; decltype(list) parent_list = nullptr; - treeml::tree* n = nullptr; + tml::tree* n = nullptr; for(const auto& i : path){ n = &(*list)[i]; @@ -382,7 +382,7 @@ class tree_view_items_provider : public ruis::tree_view::provider{ list = &n->children; } - auto ret = utki::make_shared(this->context, treeml::forest(), ruis::row_layout::instance); + auto ret = utki::make_shared(this->context, tml::forest(), ruis::row_layout::instance); { auto v = this->context.get().inflater.inflate( @@ -409,7 +409,7 @@ class tree_view_items_provider : public ruis::tree_view::provider{ auto value = v.get().try_get_widget_as("value"); ASSERT(value) value->set_text( - n->value.to_string() // NOLINT(clang-analyzer-core.CallAndMessage): due to ASSERT(!path.empty()) in the beginning of the function 'n' is not nullptr + n->value.string // NOLINT(clang-analyzer-core.CallAndMessage): due to ASSERT(!path.empty()) in the beginning of the function 'n' is not nullptr ); } { diff --git a/xcode/Podfile b/xcode/Podfile index 71266e3..8797291 100644 --- a/xcode/Podfile +++ b/xcode/Podfile @@ -8,7 +8,7 @@ target "ruisapp" do pod 'utki', '>= 1.1.124' pod 'papki', '>= 1.0.93' pod 'r4', '>= 0.1.53' - pod 'treeml', '>= 0.1.28' + pod 'tml', '>= 0.1.28' pod 'ruis', '>= 0.5.210' pod 'ruis-render-opengles', '>= 0.1.50' end