diff options
| author | Eugene Sandulenko | 2017-01-17 20:28:12 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-01-17 20:30:32 +0100 |
| commit | 4ede54e6b0f76201937fc90387f3579fbb546719 (patch) | |
| tree | e5ba68dfcfac176541a6eba7e81155bdc2ec32a3 /graphics/fonts/macfont.h | |
| parent | 1fea15ac7bb4533bc2e6a90b5a9661ce56430bb0 (diff) | |
| download | scummvm-rg350-4ede54e6b0f76201937fc90387f3579fbb546719.tar.gz scummvm-rg350-4ede54e6b0f76201937fc90387f3579fbb546719.tar.bz2 scummvm-rg350-4ede54e6b0f76201937fc90387f3579fbb546719.zip | |
GRAPHICS: Rename MacFont to MacFONTFont to avoid clashed
Diffstat (limited to 'graphics/fonts/macfont.h')
| -rw-r--r-- | graphics/fonts/macfont.h | 6 |
1 files changed, 3 insertions, 3 deletions
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; |