From 9976293c1ecb952db0b74e265313f8aecbce35e0 Mon Sep 17 00:00:00 2001
From: Peter Nelson <peter1138@openttd.org>
Date: Fri, 26 May 2023 19:32:41 +0100
Subject: [PATCH] Codechange: Return fontcache font name as std::string.

---
 src/fontcache.h                     | 2 +-
 src/fontcache/freetypefontcache.cpp | 2 +-
 src/fontcache/spritefontcache.h     | 2 +-
 src/os/macosx/font_osx.h            | 2 +-
 src/os/macosx/string_osx.cpp        | 2 +-
 src/os/windows/font_win32.h         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/fontcache.h b/src/fontcache.h
index 3241723f76..6f9958f889 100644
--- a/src/fontcache.h
+++ b/src/fontcache.h
@@ -134,7 +134,7 @@ public:
 	 * Get the name of this font.
 	 * @return The name of the font.
 	 */
-	virtual const char *GetFontName() = 0;
+	virtual std::string GetFontName() = 0;
 
 	/**
 	 * Get the font cache of a given font size.
diff --git a/src/fontcache/freetypefontcache.cpp b/src/fontcache/freetypefontcache.cpp
index 0a8a1af53f..a9cc9b9a07 100644
--- a/src/fontcache/freetypefontcache.cpp
+++ b/src/fontcache/freetypefontcache.cpp
@@ -42,7 +42,7 @@ public:
 	~FreeTypeFontCache();
 	void ClearFontCache() override;
 	GlyphID MapCharToGlyph(WChar key) override;
-	const char *GetFontName() override { return face->family_name; }
+	std::string GetFontName() override { return face->family_name; }
 	bool IsBuiltInFont() override { return false; }
 	const void *GetOSHandle() override { return &face; }
 };
diff --git a/src/fontcache/spritefontcache.h b/src/fontcache/spritefontcache.h
index a47b4ac18f..ce74972b3e 100644
--- a/src/fontcache/spritefontcache.h
+++ b/src/fontcache/spritefontcache.h
@@ -31,7 +31,7 @@ public:
 	virtual bool GetDrawGlyphShadow();
 	virtual GlyphID MapCharToGlyph(WChar key) { assert(IsPrintable(key)); return SPRITE_GLYPH | key; }
 	virtual const void *GetFontTable(uint32 tag, size_t &length) { length = 0; return nullptr; }
-	virtual const char *GetFontName() { return "sprite"; }
+	virtual std::string GetFontName() { return "sprite"; }
 	virtual bool IsBuiltInFont() { return true; }
 };
 
diff --git a/src/os/macosx/font_osx.h b/src/os/macosx/font_osx.h
index 7b58bc772c..72518c5676 100644
--- a/src/os/macosx/font_osx.h
+++ b/src/os/macosx/font_osx.h
@@ -30,7 +30,7 @@ public:
 
 	void ClearFontCache() override;
 	GlyphID MapCharToGlyph(WChar key) override;
-	const char *GetFontName() override { return font_name.c_str(); }
+	std::string GetFontName() override { return font_name; }
 	bool IsBuiltInFont() override { return false; }
 	const void *GetOSHandle() override { return font.get(); }
 };
diff --git a/src/os/macosx/string_osx.cpp b/src/os/macosx/string_osx.cpp
index e6c37249ec..52feb74c9b 100644
--- a/src/os/macosx/string_osx.cpp
+++ b/src/os/macosx/string_osx.cpp
@@ -178,7 +178,7 @@ static CTRunDelegateCallbacks _sprite_font_callback = {
 		if (font == nullptr) {
 			if (!_font_cache[i.second->fc->GetSize()]) {
 				/* Cache font information. */
-				CFAutoRelease<CFStringRef> font_name(CFStringCreateWithCString(kCFAllocatorDefault, i.second->fc->GetFontName(), kCFStringEncodingUTF8));
+				CFAutoRelease<CFStringRef> font_name(CFStringCreateWithCString(kCFAllocatorDefault, i.second->fc->GetFontName().c_str(), kCFStringEncodingUTF8));
 				_font_cache[i.second->fc->GetSize()].reset(CTFontCreateWithName(font_name.get(), i.second->fc->GetFontSize(), nullptr));
 			}
 			font = _font_cache[i.second->fc->GetSize()].get();
diff --git a/src/os/windows/font_win32.h b/src/os/windows/font_win32.h
index b83b2c5f35..7f5f62a7f2 100644
--- a/src/os/windows/font_win32.h
+++ b/src/os/windows/font_win32.h
@@ -34,7 +34,7 @@ public:
 	~Win32FontCache();
 	void ClearFontCache() override;
 	GlyphID MapCharToGlyph(WChar key) override;
-	const char *GetFontName() override { return this->fontname.c_str(); }
+	std::string GetFontName() override { return this->fontname; }
 	const void *GetOSHandle() override { return &this->logfont; }
 };