From 1bca8f0201c6971ad1a721d993120710c4b1cfeb Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 20 Mar 2020 14:59:27 +0100
Subject: [PATCH] Rename palette() to icon_palette().

---
 subprojects/memcard/include/memcard/block.hpp | 2 +-
 subprojects/memcard/src/block.cpp             | 2 +-
 subprojects/memcard/src/icon_fetch.cpp        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/subprojects/memcard/include/memcard/block.hpp b/subprojects/memcard/include/memcard/block.hpp
index 5bab4ad..cadca47 100644
--- a/subprojects/memcard/include/memcard/block.hpp
+++ b/subprojects/memcard/include/memcard/block.hpp
@@ -41,7 +41,7 @@ public:
 
 	static constexpr std::size_t size() { return FrameSize * 64; }
 
-	std::vector<uint8_t> palette() const;
+	std::vector<uint8_t> icon_palette() const;
 	bool has_magic() const;
 	IconDisplayFlag icon_display_flag() const;
 	int block_count() const;
diff --git a/subprojects/memcard/src/block.cpp b/subprojects/memcard/src/block.cpp
index 07cbd22..5a0bdc5 100644
--- a/subprojects/memcard/src/block.cpp
+++ b/subprojects/memcard/src/block.cpp
@@ -97,7 +97,7 @@ auto BasicBlock<Const>::frame(unsigned int idx) const -> const data_type* {
 }
 
 template <bool Const>
-std::vector<uint8_t> BasicBlock<Const>::palette() const {
+std::vector<uint8_t> BasicBlock<Const>::icon_palette() const {
 	const auto ptr = frame(0);
 	return extract_palette(ptr, ptr + FrameSize);
 }
diff --git a/subprojects/memcard/src/icon_fetch.cpp b/subprojects/memcard/src/icon_fetch.cpp
index 7184e8f..f2f2db0 100644
--- a/subprojects/memcard/src/icon_fetch.cpp
+++ b/subprojects/memcard/src/icon_fetch.cpp
@@ -119,7 +119,7 @@ namespace {
 std::vector<std::vector<char>> icon_fetch (const psx::ConstBlock& block, int width, int height) {
 	const constexpr int in_height = 16, in_width = 16;
 	const bool scale = (in_width != width or in_height != height);
-	const std::vector<uint8_t> palette = block.palette();
+	const std::vector<uint8_t> palette = block.icon_palette();
 	assert(palette.size() == 16 * 4);
 	const int32_t palette_padded_size = (not scale) * (((palette.size() * CHAR_BIT + 31) bitand ~31)  / CHAR_BIT);
 	assert(palette.size() == static_cast<std::size_t>(palette_padded_size) or scale);