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

[keel,nostalgia/core] Remove implicit String::String(String const&) calls

Browse Source
This commit is contained in:
Gary Talent 2023-12-01 23:38:59 -06:00
parent 91fd0d0786
commit 742427584a
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/keel/media.cpp
View File

@ -46,7 +46,7 @@ static void clearUuidMap(Context &ctx) noexcept {
ctx.pathToUuid.clear(); ctx.pathToUuid.clear();
} }
void createUuidMapping(Context &ctx, ox::String filePath, ox::UUID const&uuid) noexcept { void createUuidMapping(Context &ctx, ox::StringView filePath, ox::UUID const&uuid) noexcept {
ctx.pathToUuid[filePath] = uuid; ctx.pathToUuid[filePath] = uuid;
ctx.uuidToPath[uuid.toString()] = std::move(filePath); ctx.uuidToPath[uuid.toString()] = std::move(filePath);
} }
@ -54,7 +54,7 @@ void createUuidMapping(Context &ctx, ox::String filePath, ox::UUID const&uuid) n
static ox::Error buildUuidMap(Context &ctx, ox::CRStringView path) noexcept { static ox::Error buildUuidMap(Context &ctx, ox::CRStringView path) noexcept {
oxRequire(files, ctx.rom->ls(path)); oxRequire(files, ctx.rom->ls(path));
for (const auto &f : files) { for (const auto &f : files) {
oxRequire(filePath, ox::join("/", ox::Array<ox::StringView, 2>{path, f})); oxRequireM(filePath, ox::join("/", ox::Array<ox::StringView, 2>{path, f}));
oxRequire(stat, ctx.rom->stat(filePath)); oxRequire(stat, ctx.rom->stat(filePath));
if (stat.fileType == ox::FileType::NormalFile) { if (stat.fileType == ox::FileType::NormalFile) {
oxRequire(data, ctx.rom->read(filePath)); oxRequire(data, ctx.rom->read(filePath));

2
src/keel/media.hpp
View File

@ -91,7 +91,7 @@ ox::Result<keel::AssetRef<T>> readObjNoCache(
#endif #endif
void createUuidMapping(Context &ctx, ox::String filePath, ox::UUID const&uuid) noexcept; void createUuidMapping(Context &ctx, ox::StringView filePath, ox::UUID const&uuid) noexcept;
ox::Error buildUuidMap(Context &ctx) noexcept; ox::Error buildUuidMap(Context &ctx) noexcept;

4
src/nostalgia/modules/core/src/studio/tilesheeteditormodel.cpp
View File

@ -563,9 +563,9 @@ class PaletteChangeCommand: public TileSheetCommand {
}; };
TileSheetEditorModel::TileSheetEditorModel(turbine::Context *ctx, ox::String path): TileSheetEditorModel::TileSheetEditorModel(turbine::Context *ctx, ox::StringView path):
m_ctx(ctx), m_ctx(ctx),
m_path(std::move(path)) { m_path(path) {
oxRequireT(img, readObj<TileSheet>(ctx->keelCtx, m_path)); oxRequireT(img, readObj<TileSheet>(ctx->keelCtx, m_path));
m_img = *img; m_img = *img;
if (m_img.defaultPalette) { if (m_img.defaultPalette) {

2
src/nostalgia/modules/core/src/studio/tilesheeteditormodel.hpp
View File

@ -36,7 +36,7 @@ class TileSheetEditorModel: public ox::SignalHandler {
ox::Bounds m_selectionBounds = {{-1, -1}, {-1, -1}}; ox::Bounds m_selectionBounds = {{-1, -1}, {-1, -1}};
public: public:
TileSheetEditorModel(turbine::Context *ctx, ox::String path); TileSheetEditorModel(turbine::Context *ctx, ox::StringView path);
~TileSheetEditorModel() override = default; ~TileSheetEditorModel() override = default;

4
src/nostalgia/modules/core/src/studio/tilesheeteditorview.cpp
View File

@ -11,8 +11,8 @@
namespace nostalgia::core { namespace nostalgia::core {
TileSheetEditorView::TileSheetEditorView(turbine::Context *ctx, ox::String path): TileSheetEditorView::TileSheetEditorView(turbine::Context *ctx, ox::StringView path):
m_model(ctx, std::move(path)), m_pixelsDrawer(&m_model) { m_model(ctx, path), m_pixelsDrawer(&m_model) {
// build shaders // build shaders
oxThrowError(m_pixelsDrawer.buildShader()); oxThrowError(m_pixelsDrawer.buildShader());
oxThrowError(m_pixelGridDrawer.buildShader()); oxThrowError(m_pixelGridDrawer.buildShader());

2
src/nostalgia/modules/core/src/studio/tilesheeteditorview.hpp
View File

@ -50,7 +50,7 @@ class TileSheetEditorView: public ox::SignalHandler {
std::size_t m_palIdx = 0; std::size_t m_palIdx = 0;
public: public:
TileSheetEditorView(turbine::Context *ctx, ox::String path); TileSheetEditorView(turbine::Context *ctx, ox::StringView path);
~TileSheetEditorView() override = default; ~TileSheetEditorView() override = default;