commit 41f22be3ff4246d38e238986d335346b5c889bb1
author Lei Zhang <thestig@chromium.org> Fri Jan 25 23:18:50 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Jan 25 23:18:50 2019 +0000
tree 01f2c46d82c94c583c9682feb9a2ba8ff5e7120f
parent fab1c1704f7897f0b5cca916cec92b85db5ae796

Make CFWL_Barcode's status an enum.

Fix some nits along the way.

Change-Id: Iee52addeaf3e360e5f7296edec567cd34a1c579d
Reviewed-on: https://pdfium-review.googlesource.com/c/49011
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

xfa/fwl/cfwl_barcode.h

diff --git a/xfa/fwl/cfwl_barcode.h b/xfa/fwl/cfwl_barcode.h
index cd36cc3..759d048 100644
--- a/xfa/fwl/cfwl_barcode.h
+++ b/xfa/fwl/cfwl_barcode.h
@@ -11,15 +11,8 @@
 
 #include "fxbarcode/BC_Library.h"
 #include "xfa/fwl/cfwl_edit.h"
-#include "xfa/fwl/cfwl_scrollbar.h"
-#include "xfa/fwl/cfwl_widget.h"
 
-class CFWL_WidgetProperties;
 class CFX_Barcode;
-class CFWL_Widget;
-
-#define XFA_BCS_NeedUpdate 0x0001
-#define XFA_BCS_EncodeSuccess 0x0002
 
 enum FWL_BCDAttribute {
   FWL_BCDATTRIBUTE_NONE = 0,
@@ -69,12 +62,18 @@
   void SetErrorCorrectionLevel(int32_t ecLevel);
 
  private:
+  enum class Status : uint8_t {
+    kNormal,
+    kNeedUpdate,
+    kEncodeSuccess,
+  };
+
   void GenerateBarcodeImageCache();
   void CreateBarcodeEngine();
 
   std::unique_ptr<CFX_Barcode> m_pBarcodeEngine;
-  uint32_t m_dwStatus;
-  BC_TYPE m_type;
+  Status m_eStatus = Status::kNormal;
+  BC_TYPE m_type = BC_UNKNOWN;
   BC_CHAR_ENCODING m_eCharEncoding;
   int32_t m_nModuleHeight;
   int32_t m_nModuleWidth;
@@ -86,7 +85,7 @@
   char m_cStartChar;
   char m_cEndChar;
   int32_t m_nECLevel;
-  uint32_t m_dwAttributeMask;
+  uint32_t m_dwAttributeMask = 0;
 };
 
 #endif  // XFA_FWL_CFWL_BARCODE_H_