From 96095969c6d04eebcfb1b6005b992d8c38e8e8b3 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Mon, 30 Dec 2024 19:04:20 -0500
Subject: [PATCH] Refactor GfxContext references to use gfx::GfxContext for
 consistency

---
 src/app/editor/graphics/tile16_editor.h  | 2 +-
 src/app/gfx/snes_palette.cc              | 2 +-
 src/app/gfx/snes_palette.h               | 4 +---
 src/app/zelda3/overworld/overworld_map.h | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/app/editor/graphics/tile16_editor.h b/src/app/editor/graphics/tile16_editor.h
index f40d988c..fc658da9 100644
--- a/src/app/editor/graphics/tile16_editor.h
+++ b/src/app/editor/graphics/tile16_editor.h
@@ -18,7 +18,7 @@ namespace editor {
 /**
  * @brief Popup window to edit Tile16 data
  */
-class Tile16Editor : public GfxContext, public SharedRom {
+class Tile16Editor : public gfx::GfxContext, public SharedRom {
  public:
   absl::Status InitBlockset(const gfx::Bitmap& tile16_blockset_bmp,
                             const gfx::Bitmap& current_gfx_bmp,
diff --git a/src/app/gfx/snes_palette.cc b/src/app/gfx/snes_palette.cc
index 1d4f2d82..33471721 100644
--- a/src/app/gfx/snes_palette.cc
+++ b/src/app/gfx/snes_palette.cc
@@ -349,7 +349,7 @@ absl::Status LoadAllPalettes(const std::vector<uint8_t> &rom_data,
   return absl::OkStatus();
 }
 
-}  // namespace gfx
 std::unordered_map<uint8_t, gfx::Paletteset> GfxContext::palettesets_;
 
+}  // namespace gfx
 }  // namespace yaze
diff --git a/src/app/gfx/snes_palette.h b/src/app/gfx/snes_palette.h
index c0fc781d..807074ad 100644
--- a/src/app/gfx/snes_palette.h
+++ b/src/app/gfx/snes_palette.h
@@ -404,7 +404,6 @@ struct Paletteset {
   gfx::SnesPalette composite; /**< The composite palette. */
 };
 
-} // namespace gfx
 /**
  * @brief Shared graphical context across editors.
  */
@@ -414,8 +413,7 @@ protected:
   static std::unordered_map<uint8_t, gfx::Paletteset> palettesets_;
 };
 
-
-
+} // namespace gfx
 }  // namespace yaze
 
 #endif  // YAZE_APP_GFX_PALETTE_H
diff --git a/src/app/zelda3/overworld/overworld_map.h b/src/app/zelda3/overworld/overworld_map.h
index 7864f343..c39a9510 100644
--- a/src/app/zelda3/overworld/overworld_map.h
+++ b/src/app/zelda3/overworld/overworld_map.h
@@ -57,7 +57,7 @@ constexpr int OverworldCustomTileGFXGroupEnabled = 0x140148;
 /**
  * @brief Represents a single Overworld map screen.
  */
-class OverworldMap : public GfxContext {
+class OverworldMap : public gfx::GfxContext {
  public:
   OverworldMap() = default;
   OverworldMap(int index, Rom& rom, bool load_custom_data = false);