diff options
| author | Max Horn | 2008-10-11 21:39:24 +0000 |
|---|---|---|
| committer | Max Horn | 2008-10-11 21:39:24 +0000 |
| commit | ce7ffc4d0e89684b6e6a11d0f175a91e27e4ced4 (patch) | |
| tree | 1821313f2cb45a4d9be0fa6d9c92ff6f119fb0f3 /gui/theme.h | |
| parent | 0802da1f7f357cc34ce8c497f6b1e3f35e40e853 (diff) | |
| download | scummvm-rg350-ce7ffc4d0e89684b6e6a11d0f175a91e27e4ced4.tar.gz scummvm-rg350-ce7ffc4d0e89684b6e6a11d0f175a91e27e4ced4.tar.bz2 scummvm-rg350-ce7ffc4d0e89684b6e6a11d0f175a91e27e4ced4.zip | |
Some cleanup (in particular: do not convert String -> char * -> String needlessly) & code unification (thanks to Common::Archive, regular files and those in .zip files can both be accessed via Common::File)
svn-id: r34772
Diffstat (limited to 'gui/theme.h')
| -rw-r--r-- | gui/theme.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gui/theme.h b/gui/theme.h index c4080f884e..09455ea590 100644 --- a/gui/theme.h +++ b/gui/theme.h @@ -334,9 +334,9 @@ public: * @see kThemeImages */ virtual const Graphics::Surface *getImageSurface(const kThemeImages n) const { return 0; } -protected: - const Graphics::Font *loadFont(const char *filename); +protected: + const Graphics::Font *loadFont(const Common::String &filename); Common::String genCacheFilename(const char *filename); public: @@ -344,7 +344,6 @@ public: (_loadedThemeY != g_system->getOverlayHeight())); } private: - static const char *_defaultConfigINI; int _loadedThemeX, _loadedThemeY; }; } // end of namespace GUI |