From 4ede54e6b0f76201937fc90387f3579fbb546719 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Tue, 17 Jan 2017 20:28:12 +0100 Subject: GRAPHICS: Rename MacFont to MacFONTFont to avoid clashed --- graphics/fonts/macfont.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'graphics/fonts/macfont.h') diff --git a/graphics/fonts/macfont.h b/graphics/fonts/macfont.h index ca1eb72abf..69164653b4 100644 --- a/graphics/fonts/macfont.h +++ b/graphics/fonts/macfont.h @@ -100,10 +100,10 @@ private: /** * Processing of Mac FONT/NFNT rResources */ -class MacFont : public Font { +class MacFONTFont : public Font { public: - MacFont(); - virtual ~MacFont(); + MacFONTFont(); + virtual ~MacFONTFont(); virtual int getFontHeight() const; virtual int getMaxCharWidth() const; -- cgit v1.2.3