drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 5 Pull Requests Actions Releases 8 Activity

[keel,studio,turbine] Finish removing implicit String(const char*) calls

Browse Source
This commit is contained in:
Gary Talent 2023-12-01 22:44:24 -06:00
parent 1a1c8ae6cc
commit 9904399724
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/keel/context.hpp
View File

@ -17,7 +17,7 @@ using PackTransform = ox::Error(*)(Context&, ox::Buffer &clawData);
class Context { class Context {
public: public:
ox::UPtr<ox::FileSystem> rom; ox::UPtr<ox::FileSystem> rom;
ox::BasicString<32> appName = "Keel App"; ox::BasicString<32> appName{"Keel App"};
#ifndef OX_BARE_METAL #ifndef OX_BARE_METAL
AssetManager assetManager; AssetManager assetManager;
ox::HashMap<ox::String, ox::UUID> pathToUuid; ox::HashMap<ox::String, ox::UUID> pathToUuid;

2
src/keel/test/tests.cpp
View File

@ -9,7 +9,7 @@
#include <keel/keel.hpp> #include <keel/keel.hpp>
static std::map<ox::String, ox::Error(*)()> tests = { static std::map<ox::StringView, ox::Error(*)()> tests = {
{ {
"writeUuidHeader", "writeUuidHeader",
[]() -> ox::Error { []() -> ox::Error {

2
src/keel/typestore.cpp
View File

@ -6,7 +6,7 @@
namespace keel { namespace keel {
TypeStore::TypeStore(ox::FileSystem &fs, ox::String descPath) noexcept: TypeStore::TypeStore(ox::FileSystem &fs, ox::StringView descPath) noexcept:
m_fs(fs), m_fs(fs),
m_descPath(std::move(descPath)) { m_descPath(std::move(descPath)) {
} }

2
src/keel/typestore.hpp
View File

@ -16,7 +16,7 @@ class TypeStore: public ox::TypeStore {
ox::String m_descPath; ox::String m_descPath;
public: public:
explicit TypeStore(ox::FileSystem &fs, ox::String descPath) noexcept; explicit TypeStore(ox::FileSystem &fs, ox::StringView descPath) noexcept;
protected: protected:
ox::Result<ox::UniquePtr<ox::DescriptorType>> loadDescriptor(ox::CRStringView typeId) noexcept override; ox::Result<ox::UniquePtr<ox::DescriptorType>> loadDescriptor(ox::CRStringView typeId) noexcept override;

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

@ -52,7 +52,7 @@ ox::BasicString<255> ProjectTreeModel::fullPath() const noexcept {
if (m_parent) { if (m_parent) {
return m_parent->fullPath() + "/" + ox::StringView(m_name); return m_parent->fullPath() + "/" + ox::StringView(m_name);
} }
return ""; return {};
} }
} }

8
src/studio/modlib/include/studio/itemmaker.hpp
View File

@ -34,11 +34,11 @@ class ItemMakerT: public ItemMaker {
const ox::ClawFormat fmt; const ox::ClawFormat fmt;
public: public:
constexpr explicit ItemMakerT( constexpr explicit ItemMakerT(
ox::String pDisplayName, ox::StringView pDisplayName,
ox::String pParentDir, ox::StringView pParentDir,
ox::CRStringView fileExt, ox::StringView fileExt,
ox::ClawFormat pFmt = ox::ClawFormat::Metal) noexcept: 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) { fmt(pFmt) {
} }
constexpr ItemMakerT( constexpr ItemMakerT(

2
src/turbine/glfw/clipboard.cpp
View File

@ -14,7 +14,7 @@ namespace turbine {
ox::String getClipboardText(Context &ctx) noexcept { ox::String getClipboardText(Context &ctx) noexcept {
auto &gctx = static_cast<GlfwContext&>(ctx); auto &gctx = static_cast<GlfwContext&>(ctx);
return glfwGetClipboardString(gctx.window); return ox::String(glfwGetClipboardString(gctx.window));
} }
void setClipboardText(Context &ctx, ox::CRStringView text) noexcept { void setClipboardText(Context &ctx, ox::CRStringView text) noexcept {