diff options
| author | Lars Persson | 2006-03-09 22:40:21 +0000 |
|---|---|---|
| committer | Lars Persson | 2006-03-09 22:40:21 +0000 |
| commit | 96e87cdfe7731700d06d90e94ce0f56639d83e44 (patch) | |
| tree | 83280e364f110085fb6d5d8edb2eceb2fa0a6b50 /gui | |
| parent | 2cf5859404fe91e19c2d18d57c1955d314c5da06 (diff) | |
| download | scummvm-rg350-96e87cdfe7731700d06d90e94ce0f56639d83e44.tar.gz scummvm-rg350-96e87cdfe7731700d06d90e94ce0f56639d83e44.tar.bz2 scummvm-rg350-96e87cdfe7731700d06d90e94ce0f56639d83e44.zip | |
Moved typedef Common::String into class declaration.
svn-id: r21187
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/theme.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gui/theme.h b/gui/theme.h index f6a5d8c40d..6935fbbe93 100644 --- a/gui/theme.h +++ b/gui/theme.h @@ -36,8 +36,6 @@ namespace GUI { -typedef Common::String String; - // Hints to the theme engine that the widget is used in a non-standard way. enum { @@ -61,6 +59,7 @@ enum { class Theme { + typedef Common::String String; public: Theme() : _drawArea(), _configFile(), _loadedThemeX(0), _loadedThemeY(0) { Common::MemoryReadStream s((const byte *)_defaultConfigINI, strlen(_defaultConfigINI)); @@ -265,6 +264,7 @@ private: #ifndef DISABLE_FANCY_THEMES class ThemeNew : public Theme { + typedef Common::String String; public: ThemeNew(OSystem *system, String stylefile); virtual ~ThemeNew(); @@ -494,7 +494,7 @@ private: uint _gradientFactors[kMaxGradientFactors]; }; -#endif +#endif // DISABLE_FANCY_THEMES } // end of namespace GUI #endif // GUI_THEME_H |