From e86180e842fb3ac746ab3528e7d3fe8b56bfd24d Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Thu, 17 Apr 2025 00:39:34 -0500 Subject: [PATCH] [nostalgia/core/keel] Consistency cleanup --- .../modules/gfx/src/keel/keelmodule.cpp | 22 +++++++++---------- .../modules/gfx/src/keel/typeconv.cpp | 22 +++++++++---------- .../modules/gfx/src/keel/typeconv.hpp | 22 +++++++++---------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/nostalgia/modules/gfx/src/keel/keelmodule.cpp b/src/nostalgia/modules/gfx/src/keel/keelmodule.cpp index a4493c6e6..fbef02ed8 100644 --- a/src/nostalgia/modules/gfx/src/keel/keelmodule.cpp +++ b/src/nostalgia/modules/gfx/src/keel/keelmodule.cpp @@ -41,17 +41,17 @@ static class: public keel::Module { [[nodiscard]] ox::Vector converters() const noexcept final { return { - keel::Converter::make(), - keel::Converter::make(), - keel::Converter::make(), - keel::Converter::make(), - keel::Converter::make(), - keel::Converter::make(), - keel::Converter::make(), - keel::Converter::make(), - keel::Converter::make(), - keel::Converter::make(), - keel::Converter::make(), + keel::Converter::make(), + keel::Converter::make(), + keel::Converter::make(), + keel::Converter::make(), + keel::Converter::make(), + keel::Converter::make(), + keel::Converter::make(), + keel::Converter::make(), + keel::Converter::make(), + keel::Converter::make(), + keel::Converter::make(), }; } diff --git a/src/nostalgia/modules/gfx/src/keel/typeconv.cpp b/src/nostalgia/modules/gfx/src/keel/typeconv.cpp index b299e151a..31d480298 100644 --- a/src/nostalgia/modules/gfx/src/keel/typeconv.cpp +++ b/src/nostalgia/modules/gfx/src/keel/typeconv.cpp @@ -6,7 +6,7 @@ namespace nostalgia::gfx { -ox::Error ConvertNostalgiaPaletteToPaletteV1( +ox::Error convertNostalgiaPaletteToPaletteV1( keel::Context&, NostalgiaPalette &src, PaletteV1 &dst) noexcept { @@ -14,7 +14,7 @@ ox::Error ConvertNostalgiaPaletteToPaletteV1( return {}; } -ox::Error ConvertPaletteV1ToPaletteV2( +ox::Error convertPaletteV1ToPaletteV2( keel::Context&, PaletteV1 &src, PaletteV2 &dst) noexcept { @@ -22,7 +22,7 @@ ox::Error ConvertPaletteV1ToPaletteV2( return {}; } -ox::Error ConvertPaletteV2ToPaletteV3( +ox::Error convertPaletteV2ToPaletteV3( keel::Context&, PaletteV2 &src, PaletteV3 &dst) noexcept { @@ -36,7 +36,7 @@ ox::Error ConvertPaletteV2ToPaletteV3( return {}; } -ox::Error ConvertPaletteV3ToPaletteV4( +ox::Error convertPaletteV3ToPaletteV4( keel::Context&, PaletteV3 &src, PaletteV4 &dst) noexcept { @@ -52,7 +52,7 @@ ox::Error ConvertPaletteV3ToPaletteV4( return {}; } -ox::Error ConvertPaletteV4ToPaletteV5( +ox::Error convertPaletteV4ToPaletteV5( keel::Context&, PaletteV4 &src, PaletteV5 &dst) noexcept { @@ -72,7 +72,7 @@ ox::Error ConvertPaletteV4ToPaletteV5( return {}; } -ox::Error ConvertPaletteToCompactPalette( +ox::Error convertPaletteToCompactPalette( keel::Context&, Palette &src, CompactPalette &dst) noexcept { @@ -86,7 +86,7 @@ ox::Error ConvertPaletteToCompactPalette( return {}; } -ox::Error ConvertTileSheetV1ToTileSheetV2( +ox::Error convertTileSheetV1ToTileSheetV2( keel::Context&, TileSheetV1 &src, TileSheetV2 &dst) noexcept { @@ -115,7 +115,7 @@ static void convertSubsheet( } } -ox::Error ConvertTileSheetV2ToTileSheetV3( +ox::Error convertTileSheetV2ToTileSheetV3( keel::Context&, TileSheetV2 &src, TileSheetV3 &dst) noexcept { @@ -142,7 +142,7 @@ static void convertSubsheet( } } -ox::Error ConvertTileSheetV3ToTileSheetV4( +ox::Error convertTileSheetV3ToTileSheetV4( keel::Context&, TileSheetV3 &src, TileSheetV4 &dst) noexcept { @@ -179,7 +179,7 @@ static void convertSubsheet( } } -ox::Error ConvertTileSheetV4ToTileSheetV5( +ox::Error convertTileSheetV4ToTileSheetV5( keel::Context&, TileSheetV4 &src, TileSheetV5 &dst) noexcept { @@ -191,7 +191,7 @@ ox::Error ConvertTileSheetV4ToTileSheetV5( } -ox::Error ConvertTileSheetToCompactTileSheet( +ox::Error convertTileSheetToCompactTileSheet( keel::Context&, TileSheet &src, CompactTileSheet &dst) noexcept { diff --git a/src/nostalgia/modules/gfx/src/keel/typeconv.hpp b/src/nostalgia/modules/gfx/src/keel/typeconv.hpp index 64bb5c42d..bc55aa9f7 100644 --- a/src/nostalgia/modules/gfx/src/keel/typeconv.hpp +++ b/src/nostalgia/modules/gfx/src/keel/typeconv.hpp @@ -16,26 +16,26 @@ namespace nostalgia::gfx { // Type converters -ox::Error ConvertNostalgiaPaletteToPaletteV1(keel::Context&, NostalgiaPalette &src, PaletteV1 &dst) noexcept; +ox::Error convertNostalgiaPaletteToPaletteV1(keel::Context&, NostalgiaPalette &src, PaletteV1 &dst) noexcept; -ox::Error ConvertPaletteV1ToPaletteV2(keel::Context&, PaletteV1 &src, PaletteV2 &dst) noexcept; +ox::Error convertPaletteV1ToPaletteV2(keel::Context&, PaletteV1 &src, PaletteV2 &dst) noexcept; -ox::Error ConvertPaletteV2ToPaletteV3(keel::Context&, PaletteV2 &src, PaletteV3 &dst) noexcept; +ox::Error convertPaletteV2ToPaletteV3(keel::Context&, PaletteV2 &src, PaletteV3 &dst) noexcept; -ox::Error ConvertPaletteV3ToPaletteV4(keel::Context&, PaletteV3 &src, PaletteV4 &dst) noexcept; +ox::Error convertPaletteV3ToPaletteV4(keel::Context&, PaletteV3 &src, PaletteV4 &dst) noexcept; -ox::Error ConvertPaletteV4ToPaletteV5(keel::Context&, PaletteV4 &src, PaletteV5 &dst) noexcept; +ox::Error convertPaletteV4ToPaletteV5(keel::Context&, PaletteV4 &src, PaletteV5 &dst) noexcept; -ox::Error ConvertPaletteToCompactPalette(keel::Context&, Palette &src, CompactPalette &dst) noexcept; +ox::Error convertPaletteToCompactPalette(keel::Context&, Palette &src, CompactPalette &dst) noexcept; -ox::Error ConvertTileSheetV1ToTileSheetV2(keel::Context&, TileSheetV1 &src, TileSheetV2 &dst) noexcept; +ox::Error convertTileSheetV1ToTileSheetV2(keel::Context&, TileSheetV1 &src, TileSheetV2 &dst) noexcept; -ox::Error ConvertTileSheetV2ToTileSheetV3(keel::Context&, TileSheetV2 &src, TileSheetV3 &dst) noexcept; +ox::Error convertTileSheetV2ToTileSheetV3(keel::Context&, TileSheetV2 &src, TileSheetV3 &dst) noexcept; -ox::Error ConvertTileSheetV3ToTileSheetV4(keel::Context&, TileSheetV3 &src, TileSheetV4 &dst) noexcept; +ox::Error convertTileSheetV3ToTileSheetV4(keel::Context&, TileSheetV3 &src, TileSheetV4 &dst) noexcept; -ox::Error ConvertTileSheetV4ToTileSheetV5(keel::Context&, TileSheetV4 &src, TileSheetV5 &dst) noexcept; +ox::Error convertTileSheetV4ToTileSheetV5(keel::Context&, TileSheetV4 &src, TileSheetV5 &dst) noexcept; -ox::Error ConvertTileSheetToCompactTileSheet(keel::Context&, TileSheet &src, CompactTileSheet &dst) noexcept; +ox::Error convertTileSheetToCompactTileSheet(keel::Context&, TileSheet &src, CompactTileSheet &dst) noexcept; }