From d21cddaa7548584bfcebefe9a03e857fee3a846b Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
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/basewidget/fwl_listbox.h |  4 ++--
 xfa/include/fwl/core/fwl_widget.h        |  8 --------
 xfa/include/fwl/theme/utils.h            | 13 ++++++-------
 3 files changed, 8 insertions(+), 17 deletions(-)

(limited to 'xfa/include/fwl')

diff --git a/xfa/include/fwl/basewidget/fwl_listbox.h b/xfa/include/fwl/basewidget/fwl_listbox.h
index 49f291e813..4945ebc57f 100644
--- a/xfa/include/fwl/basewidget/fwl_listbox.h
+++ b/xfa/include/fwl/basewidget/fwl_listbox.h
@@ -59,10 +59,10 @@ int32_t m_index;
 CFX_RectF m_rect;
 END_FWL_EVENT_DEF
 typedef struct _FWL_HLISTITEM { void* pData; } * FWL_HLISTITEM;
-typedef struct _FWL_ListBoxItemData {
+struct FWL_ListBoxItemData {
   IFWL_ListBoxDP* pDataProvider;
   int32_t iIndex;
-} FWL_ListBoxItemData;
+};
 class IFWL_ListBoxDP : public IFWL_DataProvider {
  public:
   virtual int32_t CountItems(IFWL_Widget* pWidget) = 0;
diff --git a/xfa/include/fwl/core/fwl_widget.h b/xfa/include/fwl/core/fwl_widget.h
index 01022ee762..afee2d8272 100644
--- a/xfa/include/fwl/core/fwl_widget.h
+++ b/xfa/include/fwl/core/fwl_widget.h
@@ -111,14 +111,6 @@ class IFWL_Proxy {
   virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) = 0;
   virtual FWL_ERR Update() = 0;
 };
-#define FWL_ACCEL_Control (1L << 0)
-#define FWL_ACCEL_Alt (1L << 1)
-#define FWL_ACCEL_Shift (1L << 2)
-#define FWL_ACCEL_VirtKey (1L << 3)
-typedef struct _FWL_ACCEL {
-  FX_DWORD dwKey;
-  FX_DWORD dwCmd;
-} FWL_ACCEL;
 typedef CFX_MapPtrTemplate<FX_DWORD, FX_DWORD> CFX_MapAccelerators;
 FWL_ERR FWL_Accelerator_SetApp(CFX_MapAccelerators* pMapAccel);
 FWL_ERR FWL_Accelerator_SetThread(CFX_MapAccelerators* pMapAccel);
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