drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[studio] Cleanup
All checks were successful
Build / build (push) Successful in 1m16s
Details

Browse Source
This commit is contained in:
Gary Talent
2025-06-21 08:31:27 -05:00
parent eb3d53c955
commit 857587c18b
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/olympic/studio/applib/src/popups/newmenu.cpp
View File

@@ -80,9 +80,9 @@ void NewMenu::addItemMaker(ox::UPtr<ItemMaker> &&im) noexcept {
}); });
} }
void NewMenu::installItemTemplate(ox::UPtr<ItemTemplate> &tmplt) noexcept { void NewMenu::installItemTemplate(ox::UPtr<ItemTemplate> &&tmplt) noexcept {
for (auto const&im : m_types) { for (auto const&im : m_types) {
if (im->installTemplate(tmplt)) { if (im->installTemplate(std::move(tmplt))) {
break; break;
} }
} }

2
src/olympic/studio/applib/src/popups/newmenu.hpp
View File

@@ -72,7 +72,7 @@ class NewMenu final: public Popup {
void addItemMaker(ox::UPtr<ItemMaker> &&im) noexcept; void addItemMaker(ox::UPtr<ItemMaker> &&im) noexcept;
void installItemTemplate(ox::UPtr<ItemTemplate> &tmplt) noexcept; void installItemTemplate(ox::UPtr<ItemTemplate> &&tmplt) noexcept;
private: private:
void drawNewItemType(Context const&sctx) noexcept; void drawNewItemType(Context const&sctx) noexcept;

2
src/olympic/studio/applib/src/studioui.cpp
View File

@@ -438,7 +438,7 @@ void StudioUI::loadModule(Module const &mod) noexcept {
} }
auto tmplts = mod.itemTemplates(m_sctx); auto tmplts = mod.itemTemplates(m_sctx);
for (auto &t : tmplts) { for (auto &t : tmplts) {
m_newMenu.installItemTemplate(t); m_newMenu.installItemTemplate(std::move(t));
} }
} }

6
src/olympic/studio/modlib/include/studio/itemmaker.hpp
View File

@@ -109,7 +109,7 @@ class ItemMaker {
return m_typeDisplayName; return m_typeDisplayName;
} }
bool installTemplate(ox::UPtr<ItemTemplate> &tmpl) { bool installTemplate(ox::UPtr<ItemTemplate> &&tmpl) {
if (typeName() == tmpl->typeName() && if (typeName() == tmpl->typeName() &&
typeVersion() <= tmpl->typeVersion()) { typeVersion() <= tmpl->typeVersion()) {
m_templates.emplace_back(std::move(tmpl)); m_templates.emplace_back(std::move(tmpl));
@@ -120,10 +120,6 @@ class ItemMaker {
return false; return false;
} }
bool installTemplate(ox::UPtr<ItemTemplate> &&tmpl) {
return installTemplate(tmpl);
}
constexpr ox::Vector<ox::UPtr<ItemTemplate>> const&itemTemplates() const noexcept { constexpr ox::Vector<ox::UPtr<ItemTemplate>> const&itemTemplates() const noexcept {
return m_templates; return m_templates;
} }