From 76a8499630d157051d9190a0f04eb5966cad656c Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sat, 17 Jun 2023 20:52:44 -0500
Subject: [PATCH] [nostalgia] Cleanup Keel modules

---
 .../modules/core/src/keel/keelmodule.cpp      | 24 +++++++++----------
 .../modules/scene/src/keel/keelmodule.cpp     |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/nostalgia/modules/core/src/keel/keelmodule.cpp b/src/nostalgia/modules/core/src/keel/keelmodule.cpp
index 1d9ed584..f7d78cb5 100644
--- a/src/nostalgia/modules/core/src/keel/keelmodule.cpp
+++ b/src/nostalgia/modules/core/src/keel/keelmodule.cpp
@@ -14,12 +14,12 @@
 
 namespace nostalgia::core {
 
-class CoreModule: public keel::Module {
+class KeelModule: public keel::Module {
 	private:
-		NostalgiaPaletteToPaletteConverter nostalgiaPaletteToPaletteConverter;
-		TileSheetV1ToTileSheetConverter nostalgiaGraphicToTileSheetConverter;
-		TileSheetToCompactTileSheetConverter tileSheetToCompactTileSheetConverter;
-		TileSheetV2ToTileSheetConverter tileSheetV2ToTileSheetConverter;
+		NostalgiaPaletteToPaletteConverter m_nostalgiaPaletteToPaletteConverter;
+		TileSheetV1ToTileSheetConverter m_tileSheetV1ToTileSheetV2Converter;
+		TileSheetToCompactTileSheetConverter m_tileSheetToCompactTileSheetConverter;
+		TileSheetV2ToTileSheetConverter m_tileSheetV2ToTileSheetConverter;
 
 	public:
 		[[nodiscard]]
@@ -29,7 +29,6 @@ class CoreModule: public keel::Module {
 				keel::generateTypeDesc<TileSheetV2>,
 				keel::generateTypeDesc<TileSheet>,
 				keel::generateTypeDesc<CompactTileSheet>,
-				keel::generateTypeDesc<NostalgiaPalette>,
 				keel::generateTypeDesc<Palette>,
 			};
 		}
@@ -37,10 +36,10 @@ class CoreModule: public keel::Module {
 		[[nodiscard]]
 		ox::Vector<const keel::BaseConverter*> converters() const noexcept final {
 			return {
-				&nostalgiaPaletteToPaletteConverter,
-				&nostalgiaGraphicToTileSheetConverter,
-				&tileSheetToCompactTileSheetConverter,
-				&tileSheetV2ToTileSheetConverter,
+				&m_nostalgiaPaletteToPaletteConverter,
+				&m_tileSheetV1ToTileSheetV2Converter,
+				&m_tileSheetV2ToTileSheetConverter,
+				&m_tileSheetToCompactTileSheetConverter,
 			};
 		}
 
@@ -50,7 +49,8 @@ class CoreModule: public keel::Module {
 				// convert tilesheets to CompactTileSheets
 				[](keel::Context *ctx, ox::Buffer *buff) -> ox::Error {
 					oxRequire(hdr, keel::readAssetHeader(*buff));
-					const auto typeId = ox::buildTypeId(hdr.clawHdr.typeName, hdr.clawHdr.typeVersion, hdr.clawHdr.typeParams);
+					const auto typeId = ox::buildTypeId(
+							hdr.clawHdr.typeName, hdr.clawHdr.typeVersion, hdr.clawHdr.typeParams);
 					if (typeId == ox::buildTypeId<TileSheetV1>() ||
 						 typeId == ox::buildTypeId<TileSheetV2>() ||
 						 typeId == ox::buildTypeId<TileSheet>()) {
@@ -63,7 +63,7 @@ class CoreModule: public keel::Module {
 		}
 };
 
-static CoreModule mod;
+static KeelModule mod;
 const keel::Module *keelModule() noexcept {
 	return &mod;
 }
diff --git a/src/nostalgia/modules/scene/src/keel/keelmodule.cpp b/src/nostalgia/modules/scene/src/keel/keelmodule.cpp
index 29d0744a..96035be4 100644
--- a/src/nostalgia/modules/scene/src/keel/keelmodule.cpp
+++ b/src/nostalgia/modules/scene/src/keel/keelmodule.cpp
@@ -12,7 +12,7 @@ namespace nostalgia::scene {
 
 class SceneModule: public keel::Module {
 	private:
-		SceneDocToSceneStaticConverter sceneDocToSceneStaticConverter;
+		SceneDocToSceneStaticConverter m_sceneDocToSceneStaticConverter;
 
 	public:
 		[[nodiscard]]
@@ -26,7 +26,7 @@ class SceneModule: public keel::Module {
 		[[nodiscard]]
 		ox::Vector<const keel::BaseConverter*> converters() const noexcept override {
 			return {
-				&sceneDocToSceneStaticConverter,
+				&m_sceneDocToSceneStaticConverter,
 			};
 		}