[Scummvm-cvs-logs] SF.net SVN: scummvm: [22929] scummvm/trunk/gui

[fingolfin at users.sourceforge.net]

Revision: 22929
Author:   fingolfin
Date:     2006-06-05 05:29:21 -0700 (Mon, 05 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22929&view=rev

Log Message:
-----------
Fixing some more typenames to comply to the ScummVM coding guidelines

Modified Paths:
--------------
    scummvm/trunk/gui/ThemeNew.cpp
    scummvm/trunk/gui/theme.h
Modified: scummvm/trunk/gui/ThemeNew.cpp
===================================================================
--- scummvm/trunk/gui/ThemeNew.cpp	2006-06-05 12:22:51 UTC (rev 22928)
+++ scummvm/trunk/gui/ThemeNew.cpp	2006-06-05 12:29:21 UTC (rev 22929)
@@ -522,10 +522,10 @@
 
 	Common::Rect r2;
 	
-	kImageHandles corner, top, left, bkgd;
-	kShadowStyles shadow;
-	kColorHandles start, end;
-	kGradientFactors factor;
+	ImageHandles corner, top, left, bkgd;
+	ShadowStyles shadow;
+	ColorHandles start, end;
+	GradientFactors factor;
 
 	switch (background) {
 	case kWidgetBackgroundBorderSmall:

Modified: scummvm/trunk/gui/theme.h
===================================================================
--- scummvm/trunk/gui/theme.h	2006-06-05 12:22:51 UTC (rev 22928)
+++ scummvm/trunk/gui/theme.h	2006-06-05 12:29:21 UTC (rev 22929)
@@ -345,7 +345,7 @@
 	void drawSurfaceMasked(const Common::Rect &r, const Graphics::Surface *surf, bool upDown, bool leftRight, int alpha,
 							OverlayColor start, OverlayColor end, uint factor = 1);
 
-	enum kShadowStyles {
+	enum ShadowStyles {
 		kShadowFull = 0,
 		kShadowSmall = 1,
 		kShadowButton = 2,
@@ -393,7 +393,7 @@
 	void setupFont(const String &key, const String &name, FontStyle style);
 
 public:
-	enum kImageHandles {
+	enum ImageHandles {
 		kDialogBkgdCorner = 0,
 		kDialogBkgdTop = 1,
 		kDialogBkgdLeft = 2,
@@ -484,7 +484,7 @@
 	const String *_imageHandles;
 	const Graphics::Surface **_images;
 	
-	enum kColorHandles {
+	enum ColorHandles {
 		kMainDialogStart = 0,
 		kMainDialogEnd = 1,
 		
@@ -551,7 +551,7 @@
 	
 	OverlayColor _colors[kColorHandlesMax];
 	
-	enum kGradientFactors {
+	enum GradientFactors {
 		kMainDialogFactor = 0,
 		kDialogFactor = 1,
 		kDialogSpecialFactor = 2,


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