Skip to content

Commit

Permalink
treeml -> tml
Browse files Browse the repository at this point in the history
  • Loading branch information
Ivan Gagis committed Feb 29, 2024
1 parent 56b9cab commit 02e6a3c
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion homebrew/ruisapp.rb.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions msvs_solution/libruisapp/libruisapp.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@
<Import Project="..\packages\librasterimage.0.1.11\build\native\librasterimage.targets" Condition="Exists('..\packages\librasterimage.0.1.11\build\native\librasterimage.targets')" />
<Import Project="..\packages\libsvgdom.0.4.11\build\native\libsvgdom.targets" Condition="Exists('..\packages\libsvgdom.0.4.11\build\native\libsvgdom.targets')" />
<Import Project="..\packages\libsvgren.0.6.10\build\native\libsvgren.targets" Condition="Exists('..\packages\libsvgren.0.6.10\build\native\libsvgren.targets')" />
<Import Project="..\packages\libtreeml.0.2.13\build\native\libtreeml.targets" Condition="Exists('..\packages\libtreeml.0.2.13\build\native\libtreeml.targets')" />
<Import Project="..\packages\libtml.0.2.13\build\native\libtml.targets" Condition="Exists('..\packages\libtml.0.2.13\build\native\libtml.targets')" />
<Import Project="..\packages\libruis.0.5.213\build\native\libruis.targets" Condition="Exists('..\packages\libruis.0.5.213\build\native\libruis.targets')" />
<Import Project="..\packages\libruis-render-opengl.0.1.65\build\native\libruis-render-opengl.targets" Condition="Exists('..\packages\libruis-render-opengl.0.1.65\build\native\libruis-render-opengl.targets')" />
</ImportGroup>
Expand All @@ -619,7 +619,7 @@
<Error Condition="!Exists('..\packages\librasterimage.0.1.11\build\native\librasterimage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\librasterimage.0.1.11\build\native\librasterimage.targets'))" />
<Error Condition="!Exists('..\packages\libsvgdom.0.4.11\build\native\libsvgdom.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\libsvgdom.0.4.11\build\native\libsvgdom.targets'))" />
<Error Condition="!Exists('..\packages\libsvgren.0.6.10\build\native\libsvgren.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\libsvgren.0.6.10\build\native\libsvgren.targets'))" />
<Error Condition="!Exists('..\packages\libtreeml.0.2.13\build\native\libtreeml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\libtreeml.0.2.13\build\native\libtreeml.targets'))" />
<Error Condition="!Exists('..\packages\libtml.0.2.13\build\native\libtml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\libtml.0.2.13\build\native\libtml.targets'))" />
<Error Condition="!Exists('..\packages\libruis.0.5.213\build\native\libruis.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\libruis.0.5.213\build\native\libruis.targets'))" />
<Error Condition="!Exists('..\packages\libruis-render-opengl.0.1.65\build\native\libruis-render-opengl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\libruis-render-opengl.0.1.65\build\native\libruis-render-opengl.targets'))" />
</Target>
Expand Down
2 changes: 1 addition & 1 deletion msvs_solution/libruisapp/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<package id="libruis-render-opengl" version="0.1.65" targetFramework="native" />
<package id="libsvgdom" version="0.4.11" targetFramework="native" />
<package id="libsvgren" version="0.6.10" targetFramework="native" />
<package id="libtreeml" version="0.2.13" targetFramework="native" />
<package id="libtml" version="0.2.13" targetFramework="native" />
<package id="libutki" version="1.1.228" targetFramework="native" />
<package id="zlib_static" version="1.2.11.12" targetFramework="native" />
</packages>
2 changes: 1 addition & 1 deletion msvs_solution/tests/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<package id="libruis-render-opengl" version="0.1.65" targetFramework="native" />
<package id="libsvgdom" version="0.4.11" targetFramework="native" />
<package id="libsvgren" version="0.6.10" targetFramework="native" />
<package id="libtreeml" version="0.2.13" targetFramework="native" />
<package id="libtml" version="0.2.13" targetFramework="native" />
<package id="libutki" version="1.1.228" targetFramework="native" />
<package id="zlib_static" version="1.2.11.12" targetFramework="native" />
</packages>
4 changes: 2 additions & 2 deletions msvs_solution/tests/tests.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@
<Import Project="..\packages\librasterimage.0.1.11\build\native\librasterimage.targets" Condition="Exists('..\packages\librasterimage.0.1.11\build\native\librasterimage.targets')" />
<Import Project="..\packages\libsvgdom.0.4.11\build\native\libsvgdom.targets" Condition="Exists('..\packages\libsvgdom.0.4.11\build\native\libsvgdom.targets')" />
<Import Project="..\packages\libsvgren.0.6.10\build\native\libsvgren.targets" Condition="Exists('..\packages\libsvgren.0.6.10\build\native\libsvgren.targets')" />
<Import Project="..\packages\libtreeml.0.2.13\build\native\libtreeml.targets" Condition="Exists('..\packages\libtreeml.0.2.13\build\native\libtreeml.targets')" />
<Import Project="..\packages\libtml.0.2.13\build\native\libtml.targets" Condition="Exists('..\packages\libtml.0.2.13\build\native\libtml.targets')" />
<Import Project="..\packages\libruis.0.5.213\build\native\libruis.targets" Condition="Exists('..\packages\libruis.0.5.213\build\native\libruis.targets')" />
<Import Project="..\packages\libruis-render-opengl.0.1.65\build\native\libruis-render-opengl.targets" Condition="Exists('..\packages\libruis-render-opengl.0.1.65\build\native\libruis-render-opengl.targets')" />
</ImportGroup>
Expand All @@ -620,7 +620,7 @@
<Error Condition="!Exists('..\packages\librasterimage.0.1.11\build\native\librasterimage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\librasterimage.0.1.11\build\native\librasterimage.targets'))" />
<Error Condition="!Exists('..\packages\libsvgdom.0.4.11\build\native\libsvgdom.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\libsvgdom.0.4.11\build\native\libsvgdom.targets'))" />
<Error Condition="!Exists('..\packages\libsvgren.0.6.10\build\native\libsvgren.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\libsvgren.0.6.10\build\native\libsvgren.targets'))" />
<Error Condition="!Exists('..\packages\libtreeml.0.2.13\build\native\libtreeml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\libtreeml.0.2.13\build\native\libtreeml.targets'))" />
<Error Condition="!Exists('..\packages\libtml.0.2.13\build\native\libtml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\libtml.0.2.13\build\native\libtml.targets'))" />
<Error Condition="!Exists('..\packages\libruis.0.5.213\build\native\libruis.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\libruis.0.5.213\build\native\libruis.targets'))" />
<Error Condition="!Exists('..\packages\libruis-render-opengl.0.1.65\build\native\libruis-render-opengl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\libruis-render-opengl.0.1.65\build\native\libruis-render-opengl.targets'))" />
</Target>
Expand Down
2 changes: 1 addition & 1 deletion nuget/nuget.autopkg.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
}
Expand Down
2 changes: 1 addition & 1 deletion src/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/app/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
28 changes: 14 additions & 14 deletions tests/app/src/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class simple_widget :
utki::shared_ref<const ruis::res::texture> tex;

public:
simple_widget(const utki::shared_ref<ruis::context>& c, const treeml::forest& desc) :
simple_widget(const utki::shared_ref<ruis::context>& c, const tml::forest& desc) :
ruis::widget(c, desc),
ruis::character_input_widget(this->context),
tex(this->context.get().loader.load<ruis::res::texture>("tex_sample"))
Expand Down Expand Up @@ -149,7 +149,7 @@ class cube_widget : public ruis::widget, public ruis::updateable{
public:
std::shared_ptr<ruis::vertex_array> cubeVAO;

cube_widget(const utki::shared_ref<ruis::context>& c, const treeml::forest& desc) :
cube_widget(const utki::shared_ref<ruis::context>& c, const tml::forest& desc) :
ruis::widget(c, desc)
{
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
Expand Down Expand Up @@ -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<ruis::context> context;
public:
Expand All @@ -252,7 +252,7 @@ class tree_view_items_provider : public ruis::tree_view::provider{
tree_view_items_provider(const utki::shared_ref<ruis::context>& c) :
context(c)
{
this->root = treeml::read(R"qwertyuiop(
this->root = tml::read(R"qwertyuiop(
root1{
subroot1{
subsubroot1
Expand Down Expand Up @@ -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;
Expand All @@ -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();
Expand All @@ -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;
Expand All @@ -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));
Expand All @@ -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;
Expand All @@ -374,15 +374,15 @@ 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];
parent_list = list;
list = &n->children;
}

auto ret = utki::make_shared<ruis::container>(this->context, treeml::forest(), ruis::row_layout::instance);
auto ret = utki::make_shared<ruis::container>(this->context, tml::forest(), ruis::row_layout::instance);

{
auto v = this->context.get().inflater.inflate(
Expand All @@ -409,7 +409,7 @@ class tree_view_items_provider : public ruis::tree_view::provider{
auto value = v.get().try_get_widget_as<ruis::text>("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
);
}
{
Expand Down
2 changes: 1 addition & 1 deletion xcode/Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 02e6a3c

Please sign in to comment.