[Scummvm-cvs-logs] SF.net SVN: scummvm: [21187] scummvm/trunk/gui/theme.h

anotherguest at users.sourceforge.net anotherguest at users.sourceforge.net
Thu Mar 9 14:41:02 CET 2006


Revision: 21187
Author:   anotherguest
Date:     2006-03-09 14:40:21 -0800 (Thu, 09 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21187&view=rev

Log Message:
-----------
Moved typedef Common::String into class declaration.

Modified Paths:
--------------
    scummvm/trunk/gui/theme.h
Modified: scummvm/trunk/gui/theme.h
===================================================================
--- scummvm/trunk/gui/theme.h	2006-03-09 22:37:19 UTC (rev 21186)
+++ scummvm/trunk/gui/theme.h	2006-03-09 22:40:21 UTC (rev 21187)
@@ -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 @@
 
 
 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 @@
 #ifndef DISABLE_FANCY_THEMES
 
 class ThemeNew : public Theme {
+	typedef Common::String String;
 public:
 	ThemeNew(OSystem *system, String stylefile);
 	virtual ~ThemeNew();
@@ -494,7 +494,7 @@
 	
 	uint _gradientFactors[kMaxGradientFactors];
 };
-#endif
+#endif // DISABLE_FANCY_THEMES
 } // end of namespace GUI
 
 #endif // GUI_THEME_H


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list