[nostalgia/core/keel] Consistency cleanup

src/nostalgia/modules/gfx/src/keel/keelmodule.cpp

@@ -39,19 +39,19 @@ static class: public keel::Module {
 		}
 
 		[[nodiscard]]
-		ox::Vector<keel::ConverterWrap> converters() const noexcept final {
+		ox::Vector<keel::Converter> converters() const noexcept final {
 			return {
-				keel::ConverterWrap::make<ConvertNostalgiaPaletteToPaletteV1>(),
-				keel::ConverterWrap::make<ConvertPaletteV1ToPaletteV2>(),
-				keel::ConverterWrap::make<ConvertPaletteV2ToPaletteV3>(),
-				keel::ConverterWrap::make<ConvertPaletteV3ToPaletteV4>(),
-				keel::ConverterWrap::make<ConvertPaletteV4ToPaletteV5>(),
-				keel::ConverterWrap::make<ConvertPaletteToCompactPalette>(),
-				keel::ConverterWrap::make<ConvertTileSheetV1ToTileSheetV2>(),
-				keel::ConverterWrap::make<ConvertTileSheetV2ToTileSheetV3>(),
-				keel::ConverterWrap::make<ConvertTileSheetV3ToTileSheetV4>(),
-				keel::ConverterWrap::make<ConvertTileSheetV4ToTileSheetV5>(),
-				keel::ConverterWrap::make<ConvertTileSheetToCompactTileSheet>(),
+				keel::Converter::make<convertNostalgiaPaletteToPaletteV1>(),
+				keel::Converter::make<convertPaletteV1ToPaletteV2>(),
+				keel::Converter::make<convertPaletteV2ToPaletteV3>(),
+				keel::Converter::make<convertPaletteV3ToPaletteV4>(),
+				keel::Converter::make<convertPaletteV4ToPaletteV5>(),
+				keel::Converter::make<convertPaletteToCompactPalette>(),
+				keel::Converter::make<convertTileSheetV1ToTileSheetV2>(),
+				keel::Converter::make<convertTileSheetV2ToTileSheetV3>(),
+				keel::Converter::make<convertTileSheetV3ToTileSheetV4>(),
+				keel::Converter::make<convertTileSheetV4ToTileSheetV5>(),
+				keel::Converter::make<convertTileSheetToCompactTileSheet>(),
 			};
 		}
 

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 {

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;
 
 }

src/nostalgia/modules/sound/src/keel/keelmodule.cpp

@@ -26,7 +26,7 @@ static class: public keel::Module {
 		}
 
 		[[nodiscard]]
-		ox::Vector<keel::ConverterWrap> converters() const noexcept final {
+		ox::Vector<keel::Converter> converters() const noexcept final {
 			return {
 			};
 		}

src/olympic/keel/include/keel/context.hpp

@@ -22,7 +22,7 @@ class Context {
 		AssetManager assetManager;
 		ox::HashMap<ox::String, ox::UUID> pathToUuid;
 		ox::HashMap<ox::UUIDStr, ox::String> uuidToPath;
-		ox::Vector<ConverterWrap> converters;
+		ox::Vector<Converter> converters;
 		ox::Vector<PackTransform> packTransforms;
 #else
 		std::size_t preloadSectionOffset = 0;
@@ -45,7 +45,7 @@ constexpr ox::SpanView<PackTransform> packTransforms(
 #endif
 }
 
-constexpr ox::SpanView<ConverterWrap> converters(
+constexpr ox::SpanView<Converter> converters(
 		[[maybe_unused]] Context const&ctx) noexcept {
 #ifndef OX_BARE_METAL
 	return ctx.converters;

src/olympic/keel/include/keel/module.hpp

@@ -32,7 +32,7 @@ class Module {
 		[[nodiscard]]
 		virtual ox::Vector<TypeDescGenerator> types() const noexcept;
 		[[nodiscard]]
-		virtual ox::Vector<ConverterWrap> converters() const noexcept;
+		virtual ox::Vector<Converter> converters() const noexcept;
 		[[nodiscard]]
 		virtual ox::Vector<PackTransform> packTransforms() const noexcept;
 };

src/olympic/keel/include/keel/typeconv.hpp

@@ -129,7 +129,7 @@ class BaseConverter {
 
 
 template<auto Func>
-class Converter: public BaseConverter {
+class ConverterFunc: public BaseConverter {
 	private:
 		template<typename SrcType, typename DstType>
 		struct ParamExtractor {
@@ -194,20 +194,20 @@ class Converter: public BaseConverter {
 
 };
 
-class ConverterWrap {
+class Converter {
 	private:
 		ox::AllocAlias<BaseConverter> m_buff{};
 		BaseConverter *m_conv{};
 	public:
 		template<auto Func>
-		static ConverterWrap make() {
-			ConverterWrap out;
-			static_assert(sizeof(Converter<Func>) <= sizeof(out.m_buff));
-			out.m_conv = new (out.m_buff.data()) Converter<Func>{};
+		static Converter make() {
+			Converter out;
+			static_assert(sizeof(ConverterFunc<Func>) <= sizeof(out.m_buff));
+			out.m_conv = new (out.m_buff.data()) ConverterFunc<Func>{};
 			return out;
 		}
-		constexpr ConverterWrap() {}
-		ConverterWrap(ConverterWrap const &other):
+		constexpr Converter() {}
+		Converter(Converter const &other):
 			m_buff{other.m_buff},
 			m_conv{m_buff.data()} {}
 		[[nodiscard]]

src/olympic/keel/src/module.cpp

@@ -24,7 +24,7 @@ ox::Vector<TypeDescGenerator> Module::types() const noexcept {
 	return {};
 }
 
-ox::Vector<ConverterWrap> Module::converters() const noexcept {
+ox::Vector<Converter> Module::converters() const noexcept {
 	return {};
 }
 

src/olympic/keel/src/typeconv.cpp

@@ -9,7 +9,7 @@
 namespace keel {
 
 static ox::Result<BaseConverter const*> findConverter(
-		ox::SpanView<ConverterWrap> const&converters,
+		ox::SpanView<Converter> const&converters,
 		ox::StringViewCR srcTypeName,
 		int const srcTypeVersion,
 		ox::StringViewCR dstTypeName,
@@ -32,7 +32,7 @@ static ox::Result<ox::UPtr<Wrap>> convert(BaseConverter const&c, Context &ctx, W
 
 static ox::Result<ox::UPtr<Wrap>> convert(
 		Context &ctx,
-		ox::SpanView<ConverterWrap> const&converters,
+		ox::SpanView<Converter> const&converters,
 		auto &src,
 		ox::StringViewCR srcTypeName,
 		int const srcTypeVersion,