From 6b13782967b8b775c359b0ff54e7a17534248dbe Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sun, 22 May 2011 15:43:35 +0100
Subject: GRAPHICS: Move genLocalizedFontFilename() to FontManager class

It was defined in ThemeEngine class , but I moved it to make it
possible to use localized font in other places.
---
 gui/ThemeEngine.cpp | 28 +---------------------------
 gui/ThemeEngine.h   |  1 -
 2 files changed, 1 insertion(+), 28 deletions(-)

(limited to 'gui')

diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index f8e94ade97..73c1835c9e 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -561,7 +561,7 @@ bool ThemeEngine::addFont(TextData textId, const Common::String &file) {
 	if (file == "default") {
 		_texts[textId]->_fontPtr = _font;
 	} else {
-		Common::String localized = genLocalizedFontFilename(file);
+		Common::String localized = FontMan.genLocalizedFontFilename(file);
 		// Try built-in fonts
 		_texts[textId]->_fontPtr = FontMan.getFontByName(localized);
 
@@ -1468,32 +1468,6 @@ Common::String ThemeEngine::genCacheFilename(const Common::String &filename) con
 	return Common::String();
 }
 
-Common::String ThemeEngine::genLocalizedFontFilename(const Common::String &filename) const {
-#ifndef USE_TRANSLATION
-	return filename;
-#else
-	// We will transform the font filename in the following way:
-	//   name.bdf
-	//  will become:
-	//   name-charset.bdf
-	// Note that name should not contain any dot here!
-
-	// In the first step we look for the dot. In case there is none we will
-	// return the normal filename.
-	Common::String::const_iterator dot = Common::find(filename.begin(), filename.end(), '.');
-	if (dot == filename.end())
-		return filename;
-
-	// Put the translated font filename string back together.
-	Common::String result(filename.begin(), dot);
-	result += '-';
-	result += TransMan.getCurrentCharset();
-	result += dot;
-
-	return result;
-#endif
-}
-
 
 /**********************************************************
  * Static Theme XML functions
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index cc446ac6b0..5fbea7e301 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -539,7 +539,6 @@ protected:
 	const Graphics::Font *loadFontFromArchive(const Common::String &filename);
 	const Graphics::Font *loadCachedFontFromArchive(const Common::String &filename);
 	Common::String genCacheFilename(const Common::String &filename) const;
-	Common::String genLocalizedFontFilename(const Common::String &filename) const;
 
 	/**
 	 * Actual Dirty Screen handling function.
-- 
cgit v1.2.3