drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 7 Pull Requests Actions Releases 9 Activity

[nostalgia,studio] Remove implicit ox::String::String(const char*) calls

Browse Source
This commit is contained in:
Gary Talent 2023-12-01 22:35:02 -06:00
parent 644abd7f22
commit e9822bf124
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nostalgia/modules/core/src/keel/keelmodule.cpp
View File

@ -24,7 +24,7 @@ class KeelModule: public keel::Module {
public: public:
[[nodiscard]] [[nodiscard]]
ox::String id() const noexcept override { ox::String id() const noexcept override {
return "net.drinkingtea.nostalgia.core"; return ox::String("net.drinkingtea.nostalgia.core");
} }
[[nodiscard]] [[nodiscard]]

2
src/nostalgia/modules/scene/src/keel/keelmodule.cpp
View File

@ -17,7 +17,7 @@ class SceneModule: public keel::Module {
public: public:
[[nodiscard]] [[nodiscard]]
ox::String id() const noexcept override { ox::String id() const noexcept override {
return "net.drinkingtea.nostalgia.scene"; return ox::String("net.drinkingtea.nostalgia.scene");
} }
[[nodiscard]] [[nodiscard]]

2
src/nostalgia/modules/scene/src/studio/studiomodule.cpp
View File

@ -17,7 +17,7 @@ class StudioModule: public studio::Module {
ox::Vector<studio::EditorMaker> StudioModule::editors(turbine::Context *ctx) const noexcept { ox::Vector<studio::EditorMaker> StudioModule::editors(turbine::Context *ctx) const noexcept {
return { return {
{ {
{"nscn"}, {ox::String("nscn")},
[ctx](ox::CRStringView path) -> ox::Result<studio::BaseEditor*> { [ctx](ox::CRStringView path) -> ox::Result<studio::BaseEditor*> {
return ox::makeCatch<SceneEditorImGui>(*ctx, ox::String(path)); return ox::makeCatch<SceneEditorImGui>(*ctx, ox::String(path));
} }

2
src/nostalgia/studio/main.cpp
View File

@ -16,5 +16,5 @@ int main(int argc, const char **argv) {
#endif #endif
nostalgia::registerKeelModules(); nostalgia::registerKeelModules();
nostalgia::registerStudioModules(); nostalgia::registerStudioModules();
return studio::main("Nostalgia Studio", ".nostalgia", argc, argv); return studio::main("Nostalgia Studio", ox::String(".nostalgia"), argc, argv);
} }

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

@ -12,7 +12,7 @@
namespace studio { namespace studio {
NewMenu::NewMenu() noexcept { NewMenu::NewMenu() noexcept {
setTitle("New Item"); setTitle(ox::String("New Item"));
setSize({225, 110}); setSize({225, 110});
} }

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

@ -23,7 +23,7 @@ class NewMenu: public studio::Popup {
}; };
// emits path parameter // emits path parameter
ox::Signal<ox::Error(const ox::String&)> finished; ox::Signal<ox::Error(ox::StringView)> finished;
private: private:
Stage m_stage = Stage::Closed; Stage m_stage = Stage::Closed;

4
src/studio/applib/src/projectexplorer.cpp
View File

@ -11,10 +11,10 @@
namespace studio { namespace studio {
static ox::Result<ox::UniquePtr<ProjectTreeModel>> static ox::Result<ox::UniquePtr<ProjectTreeModel>>
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(); const auto fs = explorer->romFs();
oxRequire(stat, fs->stat(path)); oxRequire(stat, fs->stat(path));
auto out = ox::make_unique<ProjectTreeModel>(explorer, name, parent); auto out = ox::make_unique<ProjectTreeModel>(explorer, ox::String(name), parent);
if (stat.fileType == ox::FileType::Directory) { if (stat.fileType == ox::FileType::Directory) {
oxRequireM(children, fs->ls(path)); oxRequireM(children, fs->ls(path));
std::sort(children.begin(), children.end()); std::sort(children.begin(), children.end());