From d18b9616bbe54db5d33363a197c8b9efa6161fa8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 4 Apr 2011 03:28:21 +0300 Subject: Rename TrueTypeFont to SDLFont. --- src/gui/gui.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/gui/gui.cpp') diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index baccb7796..aecb6a6f8 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -26,7 +26,7 @@ #include "gui/palette.h" #include "gui/sdlinput.h" #include "gui/theme.h" -#include "gui/truetypefont.h" +#include "gui/sdlfont.h" #include "gui/widgets/mouseevent.h" #include "gui/widgets/window.h" @@ -113,7 +113,7 @@ Gui::Gui(Graphics *graphics): try { - mGuiFont = new TrueTypeFont(fontFile, fontSize); + mGuiFont = new SDLFont(fontFile, fontSize); } catch (const gcn::Exception &e) { @@ -128,7 +128,7 @@ Gui::Gui(Graphics *graphics): try { - mInfoParticleFont = new TrueTypeFont( + mInfoParticleFont = new SDLFont( fontFile, fontSize, TTF_STYLE_BOLD); } catch (const gcn::Exception &e) @@ -144,7 +144,7 @@ Gui::Gui(Graphics *graphics): try { - boldFont = new TrueTypeFont(fontFile, fontSize); + boldFont = new SDLFont(fontFile, fontSize); } catch (const gcn::Exception &e) { @@ -159,7 +159,7 @@ Gui::Gui(Graphics *graphics): try { - mHelpFont = new TrueTypeFont(fontFile, fontSize); + mHelpFont = new SDLFont(fontFile, fontSize); } catch (const gcn::Exception &e) { @@ -295,20 +295,20 @@ void Gui::updateFonts() if (fontFile.empty()) fontFile = branding.getStringValue("font"); - static_cast(mGuiFont)->loadFont(fontFile, fontSize); + static_cast(mGuiFont)->loadFont(fontFile, fontSize); fontFile = config.getValue("particleFont", ""); if (fontFile.empty()) fontFile = branding.getStringValue("particleFont"); - static_cast(mInfoParticleFont)->loadFont( + static_cast(mInfoParticleFont)->loadFont( fontFile, fontSize, TTF_STYLE_BOLD); fontFile = config.getValue("boldFont", ""); if (fontFile.empty()) fontFile = branding.getStringValue("boldFont"); - static_cast(boldFont)->loadFont(fontFile, fontSize); + static_cast(boldFont)->loadFont(fontFile, fontSize); } void Gui::distributeMouseEvent(gcn::Widget* source, int type, int button, -- cgit v1.2.3-70-g09d2