From d21cddaa7548584bfcebefe9a03e857fee3a846b Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 23 Feb 2016 10:11:11 -0800 Subject: Remove many _CAPS structure names. They're technically not allowed because they are reserved for the preprocessor. Also get rid of LPC* typedefs along the way. Also provide a header for a data file containing many instance of these found along the way. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1722873002 . --- xfa/include/fwl/theme/utils.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'xfa/include/fwl/theme') diff --git a/xfa/include/fwl/theme/utils.h b/xfa/include/fwl/theme/utils.h index abbb47ef8f..dd6549666d 100644 --- a/xfa/include/fwl/theme/utils.h +++ b/xfa/include/fwl/theme/utils.h @@ -27,7 +27,7 @@ enum FWLTHEME_DIRECTION { FWLTHEME_DIRECTION_Left, FWLTHEME_DIRECTION_Right }; -typedef struct _FWLCOLOR { +struct FWLCOLOR { union { FX_DWORD color; struct { @@ -38,14 +38,13 @@ typedef struct _FWLCOLOR { }; }; - _FWLCOLOR() { color = 0; } - _FWLCOLOR(FX_DWORD c) { color = c; } - _FWLCOLOR(const _FWLCOLOR& c) { color = c.color; } - - bool operator==(const _FWLCOLOR& frColor) { return color == frColor.color; } + FWLCOLOR() : color(0) {} + FWLCOLOR(FX_DWORD c) : color(c) {} + FWLCOLOR(const FWLCOLOR& c) : color(c.color) {} + bool operator==(const FWLCOLOR& frColor) { return color == frColor.color; } operator FX_DWORD() { return color; } -} FWLCOLOR; +}; #define FWLTHEME_BEZIER FX_BEZIER #define FWLTHEME_PI FX_PI #define FWLTHEME_PI_2_1 (FX_PI / 2.0f) -- cgit v1.2.3