From 110718603ce0d84e53337384b56e884020655d24 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 5 Jun 2006 12:29:21 +0000 Subject: [PATCH] Fixing some more typenames to comply to the ScummVM coding guidelines svn-id: r22929 --- gui/ThemeNew.cpp | 8 ++++---- gui/theme.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gui/ThemeNew.cpp b/gui/ThemeNew.cpp index 4598498d808..1ad9f7daa52 100644 --- a/gui/ThemeNew.cpp +++ b/gui/ThemeNew.cpp @@ -522,10 +522,10 @@ void ThemeNew::drawWidgetBackground(const Common::Rect &r, uint16 hints, WidgetB 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: diff --git a/gui/theme.h b/gui/theme.h index 94f3f87fc30..5d4532da5df 100644 --- a/gui/theme.h +++ b/gui/theme.h @@ -345,7 +345,7 @@ private: 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 @@ private: 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 @@ private: const String *_imageHandles; const Graphics::Surface **_images; - enum kColorHandles { + enum ColorHandles { kMainDialogStart = 0, kMainDialogEnd = 1, @@ -551,7 +551,7 @@ private: OverlayColor _colors[kColorHandlesMax]; - enum kGradientFactors { + enum GradientFactors { kMainDialogFactor = 0, kDialogFactor = 1, kDialogSpecialFactor = 2,