diff --git a/src/keel/context.hpp b/src/keel/context.hpp index 5376d966..4ac30af2 100644 --- a/src/keel/context.hpp +++ b/src/keel/context.hpp @@ -17,7 +17,7 @@ using PackTransform = ox::Error(*)(Context&, ox::Buffer &clawData); class Context { public: ox::UPtr rom; - ox::BasicString<32> appName = "Keel App"; + ox::BasicString<32> appName{"Keel App"}; #ifndef OX_BARE_METAL AssetManager assetManager; ox::HashMap pathToUuid; diff --git a/src/keel/test/tests.cpp b/src/keel/test/tests.cpp index 6d14c398..e4cd8059 100644 --- a/src/keel/test/tests.cpp +++ b/src/keel/test/tests.cpp @@ -9,7 +9,7 @@ #include -static std::map tests = { +static std::map tests = { { "writeUuidHeader", []() -> ox::Error { diff --git a/src/keel/typestore.cpp b/src/keel/typestore.cpp index b267d019..aae7523c 100644 --- a/src/keel/typestore.cpp +++ b/src/keel/typestore.cpp @@ -6,7 +6,7 @@ namespace keel { -TypeStore::TypeStore(ox::FileSystem &fs, ox::String descPath) noexcept: +TypeStore::TypeStore(ox::FileSystem &fs, ox::StringView descPath) noexcept: m_fs(fs), m_descPath(std::move(descPath)) { } diff --git a/src/keel/typestore.hpp b/src/keel/typestore.hpp index 84524e43..a7bc19f5 100644 --- a/src/keel/typestore.hpp +++ b/src/keel/typestore.hpp @@ -16,7 +16,7 @@ class TypeStore: public ox::TypeStore { ox::String m_descPath; public: - explicit TypeStore(ox::FileSystem &fs, ox::String descPath) noexcept; + explicit TypeStore(ox::FileSystem &fs, ox::StringView descPath) noexcept; protected: ox::Result> loadDescriptor(ox::CRStringView typeId) noexcept override; diff --git a/src/studio/applib/src/projecttreemodel.cpp b/src/studio/applib/src/projecttreemodel.cpp index ba9d3ec2..73e82825 100644 --- a/src/studio/applib/src/projecttreemodel.cpp +++ b/src/studio/applib/src/projecttreemodel.cpp @@ -52,7 +52,7 @@ ox::BasicString<255> ProjectTreeModel::fullPath() const noexcept { if (m_parent) { return m_parent->fullPath() + "/" + ox::StringView(m_name); } - return ""; + return {}; } } diff --git a/src/studio/modlib/include/studio/itemmaker.hpp b/src/studio/modlib/include/studio/itemmaker.hpp index c7e707dd..ff0c542e 100644 --- a/src/studio/modlib/include/studio/itemmaker.hpp +++ b/src/studio/modlib/include/studio/itemmaker.hpp @@ -34,11 +34,11 @@ class ItemMakerT: public ItemMaker { const ox::ClawFormat fmt; public: constexpr explicit ItemMakerT( - ox::String pDisplayName, - ox::String pParentDir, - ox::CRStringView fileExt, + ox::StringView pDisplayName, + ox::StringView pParentDir, + ox::StringView fileExt, ox::ClawFormat pFmt = ox::ClawFormat::Metal) noexcept: - ItemMaker(std::move(pDisplayName), std::move(pParentDir), fileExt), + ItemMaker(ox::String(pDisplayName), ox::String(pParentDir), fileExt), fmt(pFmt) { } constexpr ItemMakerT( diff --git a/src/turbine/glfw/clipboard.cpp b/src/turbine/glfw/clipboard.cpp index a0329e31..8fbf122b 100644 --- a/src/turbine/glfw/clipboard.cpp +++ b/src/turbine/glfw/clipboard.cpp @@ -14,7 +14,7 @@ namespace turbine { ox::String getClipboardText(Context &ctx) noexcept { auto &gctx = static_cast(ctx); - return glfwGetClipboardString(gctx.window); + return ox::String(glfwGetClipboardString(gctx.window)); } void setClipboardText(Context &ctx, ox::CRStringView text) noexcept {