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

[nostalgia,olympic] Cleanup CMake

Browse Source
This commit is contained in:
Gary Talent
2023-12-23 12:23:47 -06:00
parent 978f2f9c4f
commit 2dba592a42
15 changed files with 64 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ void NewMenu::draw(turbine::Context &ctx) noexcept {
}
}
void NewMenu::addItemMaker(ox::UniquePtr<studio::ItemMaker> im) noexcept {
void NewMenu::addItemMaker(ox::UniquePtr<studio::ItemMaker> &&im) noexcept {
m_types.emplace_back(std::move(im));
std::sort(
m_types.begin(), m_types.end(),

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

@ -51,7 +51,7 @@ class NewMenu: public studio::Popup {
template<typename T>
void addItemType(ox::String name, ox::String parentDir, ox::String fileExt, ox::ClawFormat pFmt = ox::ClawFormat::Metal) noexcept;
void addItemMaker(ox::UniquePtr<studio::ItemMaker> im) noexcept;
void addItemMaker(ox::UniquePtr<studio::ItemMaker> &&im) noexcept;
private:
void drawNewItemType(turbine::Context &ctx) noexcept;

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

@ -44,7 +44,7 @@ void ProjectExplorer::draw(turbine::Context &ctx) noexcept {
ImGui::EndChild();
}
void ProjectExplorer::setModel(ox::UPtr<ProjectTreeModel> model) noexcept {
void ProjectExplorer::setModel(ox::UPtr<ProjectTreeModel> &&model) noexcept {
m_treeModel = std::move(model);
}

2
src/olympic/studio/applib/src/projectexplorer.hpp
View File

@ -21,7 +21,7 @@ class ProjectExplorer: public studio::Widget {
void draw(turbine::Context &ctx) noexcept override;
void setModel(ox::UPtr<ProjectTreeModel> model) noexcept;
void setModel(ox::UPtr<ProjectTreeModel> &&model) noexcept;
ox::Error refreshProjectTreeModel(ox::CRStringView = {}) noexcept;

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

@ -44,7 +44,7 @@ void ProjectTreeModel::draw(turbine::Context &ctx) const noexcept {
}
}
void ProjectTreeModel::setChildren(ox::Vector<ox::UniquePtr<ProjectTreeModel>> children) noexcept {
void ProjectTreeModel::setChildren(ox::Vector<ox::UPtr<ProjectTreeModel>> children) noexcept {
m_children = std::move(children);
}

4
src/olympic/studio/applib/src/projecttreemodel.hpp
View File

@ -16,7 +16,7 @@ class ProjectTreeModel {
class ProjectExplorer &m_explorer;
ProjectTreeModel *m_parent = nullptr;
ox::String m_name;
ox::Vector<ox::UniquePtr<ProjectTreeModel>> m_children;
ox::Vector<ox::UPtr<ProjectTreeModel>> m_children;
public:
explicit ProjectTreeModel(class ProjectExplorer &explorer, ox::String name,
ProjectTreeModel *parent = nullptr) noexcept;
@ -25,7 +25,7 @@ class ProjectTreeModel {
void draw(turbine::Context &ctx) const noexcept;
void setChildren(ox::Vector<ox::UniquePtr<ProjectTreeModel>> children) noexcept;
void setChildren(ox::Vector<ox::UPtr<ProjectTreeModel>> children) noexcept;
private:
[[nodiscard]]