diff --git a/src/nostalgia/modules/core/src/keel/keelmodule.cpp b/src/nostalgia/modules/core/src/keel/keelmodule.cpp index 26719b3b..09919475 100644 --- a/src/nostalgia/modules/core/src/keel/keelmodule.cpp +++ b/src/nostalgia/modules/core/src/keel/keelmodule.cpp @@ -24,7 +24,7 @@ class KeelModule: public keel::Module { public: [[nodiscard]] ox::String id() const noexcept override { - return "net.drinkingtea.nostalgia.core"; + return ox::String("net.drinkingtea.nostalgia.core"); } [[nodiscard]] diff --git a/src/nostalgia/modules/scene/src/keel/keelmodule.cpp b/src/nostalgia/modules/scene/src/keel/keelmodule.cpp index 258a3322..2209a569 100644 --- a/src/nostalgia/modules/scene/src/keel/keelmodule.cpp +++ b/src/nostalgia/modules/scene/src/keel/keelmodule.cpp @@ -17,7 +17,7 @@ class SceneModule: public keel::Module { public: [[nodiscard]] ox::String id() const noexcept override { - return "net.drinkingtea.nostalgia.scene"; + return ox::String("net.drinkingtea.nostalgia.scene"); } [[nodiscard]] diff --git a/src/nostalgia/modules/scene/src/studio/studiomodule.cpp b/src/nostalgia/modules/scene/src/studio/studiomodule.cpp index 72165c91..446e9d3d 100644 --- a/src/nostalgia/modules/scene/src/studio/studiomodule.cpp +++ b/src/nostalgia/modules/scene/src/studio/studiomodule.cpp @@ -17,7 +17,7 @@ class StudioModule: public studio::Module { ox::Vector StudioModule::editors(turbine::Context *ctx) const noexcept { return { { - {"nscn"}, + {ox::String("nscn")}, [ctx](ox::CRStringView path) -> ox::Result { return ox::makeCatch(*ctx, ox::String(path)); } diff --git a/src/nostalgia/studio/main.cpp b/src/nostalgia/studio/main.cpp index c371a379..97d91a2a 100644 --- a/src/nostalgia/studio/main.cpp +++ b/src/nostalgia/studio/main.cpp @@ -16,5 +16,5 @@ int main(int argc, const char **argv) { #endif nostalgia::registerKeelModules(); nostalgia::registerStudioModules(); - return studio::main("Nostalgia Studio", ".nostalgia", argc, argv); + return studio::main("Nostalgia Studio", ox::String(".nostalgia"), argc, argv); } diff --git a/src/studio/applib/src/newmenu.cpp b/src/studio/applib/src/newmenu.cpp index bae6216b..69245498 100644 --- a/src/studio/applib/src/newmenu.cpp +++ b/src/studio/applib/src/newmenu.cpp @@ -12,7 +12,7 @@ namespace studio { NewMenu::NewMenu() noexcept { - setTitle("New Item"); + setTitle(ox::String("New Item")); setSize({225, 110}); } diff --git a/src/studio/applib/src/newmenu.hpp b/src/studio/applib/src/newmenu.hpp index e134016b..bfadecd9 100644 --- a/src/studio/applib/src/newmenu.hpp +++ b/src/studio/applib/src/newmenu.hpp @@ -23,7 +23,7 @@ class NewMenu: public studio::Popup { }; // emits path parameter - ox::Signal finished; + ox::Signal finished; private: Stage m_stage = Stage::Closed; diff --git a/src/studio/applib/src/projectexplorer.cpp b/src/studio/applib/src/projectexplorer.cpp index f8db74c7..77c9c5f6 100644 --- a/src/studio/applib/src/projectexplorer.cpp +++ b/src/studio/applib/src/projectexplorer.cpp @@ -11,10 +11,10 @@ namespace studio { static ox::Result> -buildProjectTreeModel(ProjectExplorer *explorer, ox::String name, ox::CRStringView path, ProjectTreeModel *parent) noexcept { +buildProjectTreeModel(ProjectExplorer *explorer, ox::StringView name, ox::CRStringView path, ProjectTreeModel *parent) noexcept { const auto fs = explorer->romFs(); oxRequire(stat, fs->stat(path)); - auto out = ox::make_unique(explorer, name, parent); + auto out = ox::make_unique(explorer, ox::String(name), parent); if (stat.fileType == ox::FileType::Directory) { oxRequireM(children, fs->ls(path)); std::sort(children.begin(), children.end());