From 4e7dc66610e4d100044e425a6579b7b2e82d2a86 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Fri, 25 Jul 2025 22:48:08 -0500 Subject: [PATCH] [nostalgia,olympic] Rename string len() functions to size() --- .../subcommands/export-tilesheet/export-tilesheet.cpp | 2 +- src/olympic/applib/CMakeLists.txt | 5 +++++ src/olympic/keel/src/media.cpp | 2 +- src/olympic/keel/src/pack-applib.cpp | 2 +- src/olympic/keel/test/tests.cpp | 2 +- src/olympic/studio/applib/src/popups/newmenu.cpp | 2 +- src/olympic/studio/applib/src/projectexplorer.cpp | 2 +- src/olympic/studio/modlib/include/studio/project.hpp | 4 ++-- src/olympic/studio/modlib/src/filedialog_nfd.cpp | 8 ++++---- 9 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/nostalgia/modules/gfx/src/studio/subcommands/export-tilesheet/export-tilesheet.cpp b/src/nostalgia/modules/gfx/src/studio/subcommands/export-tilesheet/export-tilesheet.cpp index 31c0ce37..1f26e24f 100644 --- a/src/nostalgia/modules/gfx/src/studio/subcommands/export-tilesheet/export-tilesheet.cpp +++ b/src/nostalgia/modules/gfx/src/studio/subcommands/export-tilesheet/export-tilesheet.cpp @@ -146,7 +146,7 @@ ox::Error cmdExportTilesheet(studio::Project &project, ox::SpanView // load objects auto &kctx = project.kctx(); OX_REQUIRE(ts, keel::readObj(kctx, srcPath).transformError(4, "could not load TileSheet")); - OX_REQUIRE(pal, keel::readObj(kctx, palPath.len() ? palPath : ts->defaultPalette) + OX_REQUIRE(pal, keel::readObj(kctx, palPath.size() ? palPath : ts->defaultPalette) .transformError(5, "could not load Palette")); // export to the destination file return exportSubsheetToPng( diff --git a/src/olympic/applib/CMakeLists.txt b/src/olympic/applib/CMakeLists.txt index 0b20b16a..ef01a00c 100644 --- a/src/olympic/applib/CMakeLists.txt +++ b/src/olympic/applib/CMakeLists.txt @@ -3,6 +3,11 @@ add_library( OlympicApplib INTERFACE ) +target_link_libraries( + OlympicApplib INTERFACE + OxLogConn +) + target_sources( OlympicApplib INTERFACE applib.cpp diff --git a/src/olympic/keel/src/media.cpp b/src/olympic/keel/src/media.cpp index 0c5b8315..8dba38f4 100644 --- a/src/olympic/keel/src/media.cpp +++ b/src/olympic/keel/src/media.cpp @@ -59,7 +59,7 @@ static ox::Error buildUuidMap(Context &ctx, ox::StringViewCR path, DuplicateSet auto const [uuid, err] = readUuidHeader(buff); if (!err) { // check for duplication - if (duplicates && ctx.uuidToPath[uuid.toString()].len()) { + if (duplicates && ctx.uuidToPath[uuid.toString()].size()) { auto &dl = (*duplicates)[uuid]; if (dl.empty()) { dl.emplace_back(ctx.uuidToPath[uuid.toString()]); diff --git a/src/olympic/keel/src/pack-applib.cpp b/src/olympic/keel/src/pack-applib.cpp index 5222e033..953230b2 100644 --- a/src/olympic/keel/src/pack-applib.cpp +++ b/src/olympic/keel/src/pack-applib.cpp @@ -88,7 +88,7 @@ static ox::Error pack( oxOutf("Final ROM buff size: {} bytes\n", romBuff.size()); OX_RETURN_ERROR(writeFileBuff(argRomBin, romBuff)); OX_REQUIRE(manifestJson, ox::writeOCString(manifest)); - OX_RETURN_ERROR(writeFileBuff(argManifest, {manifestJson.data(), manifestJson.len()})); + OX_RETURN_ERROR(writeFileBuff(argManifest, {manifestJson.data(), manifestJson.size()})); return {}; } diff --git a/src/olympic/keel/test/tests.cpp b/src/olympic/keel/test/tests.cpp index 5e18e392..e78280d7 100644 --- a/src/olympic/keel/test/tests.cpp +++ b/src/olympic/keel/test/tests.cpp @@ -16,7 +16,7 @@ static std::map tests = { constexpr ox::StringView uuidStr = "8d814442-f46e-4cc3-8edc-ca3c01cc86db"; constexpr ox::StringView hdr = "K1;8d814442-f46e-4cc3-8edc-ca3c01cc86db;"; OX_REQUIRE(uuid, ox::UUID::fromString(uuidStr)); - ox::Array buff; + ox::Array buff; ox::CharBuffWriter bw(buff); OX_RETURN_ERROR(keel::writeUuidHeader(bw, uuid)); oxExpect(ox::StringView(buff.data(), buff.size()), hdr); diff --git a/src/olympic/studio/applib/src/popups/newmenu.cpp b/src/olympic/studio/applib/src/popups/newmenu.cpp index ded8fd78..9e6d68da 100644 --- a/src/olympic/studio/applib/src/popups/newmenu.cpp +++ b/src/olympic/studio/applib/src/popups/newmenu.cpp @@ -192,7 +192,7 @@ void NewMenu::drawLastPageButtons(Context &sctx) noexcept { } void NewMenu::finish(Context &sctx) noexcept { - if (m_itemName.len() == 0) { + if (m_itemName.size() == 0) { oxLogError(ox::Error{1, "New file error: no file name"}); return; } diff --git a/src/olympic/studio/applib/src/projectexplorer.cpp b/src/olympic/studio/applib/src/projectexplorer.cpp index d3b374db..6eb90748 100644 --- a/src/olympic/studio/applib/src/projectexplorer.cpp +++ b/src/olympic/studio/applib/src/projectexplorer.cpp @@ -57,7 +57,7 @@ void ProjectExplorer::dirContextMenu(ox::StringViewCR path) const noexcept { if (ImGui::MenuItem("Add Directory")) { addDir.emit(path); } - if (path.len() && ImGui::MenuItem("Delete")) { + if (path.size() && ImGui::MenuItem("Delete")) { deleteItem.emit(path); } ImGui::EndPopup(); diff --git a/src/olympic/studio/modlib/include/studio/project.hpp b/src/olympic/studio/modlib/include/studio/project.hpp index f730e8b9..6d9bd270 100644 --- a/src/olympic/studio/modlib/include/studio/project.hpp +++ b/src/olympic/studio/modlib/include/studio/project.hpp @@ -40,8 +40,8 @@ constexpr ox::Result fileExt(ox::StringViewCR path) noexcept { [[nodiscard]] constexpr ox::StringView parentDir(ox::StringView path) noexcept { - if (path.len() && path[path.len() - 1] == '/') { - path = substr(path, 0, path.len() - 1); + if (path.size() && path[path.size() - 1] == '/') { + path = substr(path, 0, path.size() - 1); } auto const extStart = ox::find(path.crbegin(), path.crend(), '/').offset(); return substr(path, 0, extStart); diff --git a/src/olympic/studio/modlib/src/filedialog_nfd.cpp b/src/olympic/studio/modlib/src/filedialog_nfd.cpp index f298621e..2d35b60d 100644 --- a/src/olympic/studio/modlib/src/filedialog_nfd.cpp +++ b/src/olympic/studio/modlib/src/filedialog_nfd.cpp @@ -13,10 +13,10 @@ namespace studio { FDFilterItem::FDFilterItem(ox::StringViewCR pName, ox::StringViewCR pSpec) noexcept { OX_ALLOW_UNSAFE_BUFFERS_BEGIN - name.resize(pName.len() + 1); - ox::strncpy(name.data(), pName.data(), pName.len()); - spec.resize(pSpec.len() + 1); - ox::strncpy(spec.data(), pSpec.data(), pSpec.len()); + name.resize(pName.size() + 1); + ox::strncpy(name.data(), pName.data(), pName.size()); + spec.resize(pSpec.size() + 1); + ox::strncpy(spec.data(), pSpec.data(), pSpec.size()); OX_ALLOW_UNSAFE_BUFFERS_END }