Merge branch 'master' into jgrpp

2023-07-04 00:18:25 +01:00
parent d75c489466 1ff0dc11d8
commit 1e5bc2c12b
8 changed files with 9 additions and 8 deletions
--- a/src/fontcache.h
+++ b/src/fontcache.h
@@ -138,7 +138,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.