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

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

View File

@ -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]]

View File

@ -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]]

View File

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

View File

@ -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);
}

View File

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

View File

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

View File

@ -11,10 +11,10 @@
namespace studio {
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();
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) {
oxRequireM(children, fs->ls(path));
std::sort(children.begin(), children.end());