Convert XFA_ATTRIBUTE to an enum class

This CL converts the XFA_ATTRIBUTE enum to an enum class and fixes up
various usages.

Change-Id: I3dd17cc412d97eb212a65ce63bb9fa19605e1e91
Reviewed-on: https://pdfium-review.googlesource.com/18050
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

1 files changed, 15 insertions, 15 deletions

diff --git a/xfa/fxfa/cxfa_ffwidgethandler.cpp b/xfa/fxfa/cxfa_ffwidgethandler.cpp
index 4a2bf08222..72c7f03c68 100644
--- a/xfa/fxfa/cxfa_ffwidgethandler.cpp
+++ b/xfa/fxfa/cxfa_ffwidgethandler.cpp
@@ -316,27 +316,27 @@ CXFA_Node* CXFA_FFWidgetHandler::CreatePushButton(CXFA_Node* pParent,
   pText->JSNode()->SetContent(L"Button", L"Button", false, false, true);
 
   CXFA_Node* pPara = CreateCopyNode(XFA_Element::Para, pCaption);
-  pPara->JSNode()->SetEnum(XFA_ATTRIBUTE_VAlign, XFA_ATTRIBUTEENUM_Middle,
+  pPara->JSNode()->SetEnum(XFA_Attribute::VAlign, XFA_ATTRIBUTEENUM_Middle,
                            false);
-  pPara->JSNode()->SetEnum(XFA_ATTRIBUTE_HAlign, XFA_ATTRIBUTEENUM_Center,
+  pPara->JSNode()->SetEnum(XFA_Attribute::HAlign, XFA_ATTRIBUTEENUM_Center,
                            false);
   CreateFontNode(pCaption);
 
   CXFA_Node* pBorder = CreateCopyNode(XFA_Element::Border, pField);
-  pBorder->JSNode()->SetEnum(XFA_ATTRIBUTE_Hand, XFA_ATTRIBUTEENUM_Right,
+  pBorder->JSNode()->SetEnum(XFA_Attribute::Hand, XFA_ATTRIBUTEENUM_Right,
                              false);
 
   CXFA_Node* pEdge = CreateCopyNode(XFA_Element::Edge, pBorder);
-  pEdge->JSNode()->SetEnum(XFA_ATTRIBUTE_Stroke, XFA_ATTRIBUTEENUM_Raised,
+  pEdge->JSNode()->SetEnum(XFA_Attribute::Stroke, XFA_ATTRIBUTEENUM_Raised,
                            false);
 
   CXFA_Node* pFill = CreateCopyNode(XFA_Element::Fill, pBorder);
   CXFA_Node* pColor = CreateCopyNode(XFA_Element::Color, pFill);
-  pColor->JSNode()->SetCData(XFA_ATTRIBUTE_Value, L"212, 208, 200", false,
+  pColor->JSNode()->SetCData(XFA_Attribute::Value, L"212, 208, 200", false,
                              false);
 
   CXFA_Node* pBind = CreateCopyNode(XFA_Element::Bind, pField);
-  pBind->JSNode()->SetEnum(XFA_ATTRIBUTE_Match, XFA_ATTRIBUTEENUM_None, false);
+  pBind->JSNode()->SetEnum(XFA_Attribute::Match, XFA_ATTRIBUTEENUM_None, false);
 
   return pField;
 }
@@ -356,7 +356,7 @@ CXFA_Node* CXFA_FFWidgetHandler::CreateRadioButton(CXFA_Node* pParent,
   CXFA_Node* pField = CreateField(XFA_Element::CheckButton, pParent, pBefore);
   CXFA_Node* pUi = pField->GetFirstChildByClass(XFA_Element::Ui);
   CXFA_Node* pWidget = pUi->GetFirstChildByClass(XFA_Element::CheckButton);
-  pWidget->JSNode()->SetEnum(XFA_ATTRIBUTE_Shape, XFA_ATTRIBUTEENUM_Round,
+  pWidget->JSNode()->SetEnum(XFA_Attribute::Shape, XFA_ATTRIBUTEENUM_Round,
                              false);
   return pField;
 }
@@ -400,9 +400,9 @@ CXFA_Node* CXFA_FFWidgetHandler::CreateListBox(CXFA_Node* pParent,
   CXFA_Node* pField = CreateDropdownList(pParent, pBefore);
   CXFA_Node* pUi = pField->GetNodeItem(XFA_NODEITEM_FirstChild);
   CXFA_Node* pListBox = pUi->GetNodeItem(XFA_NODEITEM_FirstChild);
-  pListBox->JSNode()->SetEnum(XFA_ATTRIBUTE_Open, XFA_ATTRIBUTEENUM_Always,
+  pListBox->JSNode()->SetEnum(XFA_Attribute::Open, XFA_ATTRIBUTEENUM_Always,
                               false);
-  pListBox->JSNode()->SetEnum(XFA_ATTRIBUTE_CommitOn, XFA_ATTRIBUTEENUM_Exit,
+  pListBox->JSNode()->SetEnum(XFA_Attribute::CommitOn, XFA_ATTRIBUTEENUM_Exit,
                               false);
   return pField;
 }
@@ -416,7 +416,7 @@ CXFA_Node* CXFA_FFWidgetHandler::CreatePasswordEdit(CXFA_Node* pParent,
                                                     CXFA_Node* pBefore) const {
   CXFA_Node* pField = CreateField(XFA_Element::PasswordEdit, pParent, pBefore);
   CXFA_Node* pBind = CreateCopyNode(XFA_Element::Bind, pField);
-  pBind->JSNode()->SetEnum(XFA_ATTRIBUTE_Match, XFA_ATTRIBUTEENUM_None, false);
+  pBind->JSNode()->SetEnum(XFA_Attribute::Match, XFA_ATTRIBUTEENUM_None, false);
   return pField;
 }
 
@@ -510,7 +510,7 @@ CXFA_Node* CXFA_FFWidgetHandler::CreateTemplateNode(XFA_Element eElement,
 
 CXFA_Node* CXFA_FFWidgetHandler::CreateFontNode(CXFA_Node* pParent) const {
   CXFA_Node* pFont = CreateCopyNode(XFA_Element::Font, pParent);
-  pFont->JSNode()->SetCData(XFA_ATTRIBUTE_Typeface, L"Myriad Pro", false,
+  pFont->JSNode()->SetCData(XFA_Attribute::Typeface, L"Myriad Pro", false,
                             false);
   return pFont;
 }
@@ -520,19 +520,19 @@ CXFA_Node* CXFA_FFWidgetHandler::CreateMarginNode(CXFA_Node* pParent,
                                                   float fInsets[4]) const {
   CXFA_Node* pMargin = CreateCopyNode(XFA_Element::Margin, pParent);
   if (dwFlags & 0x01)
-    pMargin->JSNode()->SetMeasure(XFA_ATTRIBUTE_LeftInset,
+    pMargin->JSNode()->SetMeasure(XFA_Attribute::LeftInset,
                                   CXFA_Measurement(fInsets[0], XFA_UNIT_Pt),
                                   false);
   if (dwFlags & 0x02)
-    pMargin->JSNode()->SetMeasure(XFA_ATTRIBUTE_TopInset,
+    pMargin->JSNode()->SetMeasure(XFA_Attribute::TopInset,
                                   CXFA_Measurement(fInsets[1], XFA_UNIT_Pt),
                                   false);
   if (dwFlags & 0x04)
-    pMargin->JSNode()->SetMeasure(XFA_ATTRIBUTE_RightInset,
+    pMargin->JSNode()->SetMeasure(XFA_Attribute::RightInset,
                                   CXFA_Measurement(fInsets[2], XFA_UNIT_Pt),
                                   false);
   if (dwFlags & 0x08)
-    pMargin->JSNode()->SetMeasure(XFA_ATTRIBUTE_BottomInset,
+    pMargin->JSNode()->SetMeasure(XFA_Attribute::BottomInset,
                                   CXFA_Measurement(fInsets[3], XFA_UNIT_Pt),
                                   false);
   return pMargin;