Remove FX_DWORD from XFA, part 2

xfa/fxfa/fm2js/xfa_lexer.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef XFA_FXFA_FM2JS_XFA_LEXER_H_
 #define XFA_FXFA_FM2JS_XFA_LEXER_H_
 
 #include <memory>
@@ skipping 76 matching lines @@
   XFA_FM_TOKEN m_type;
   uint32_t m_uHash;
   const FX_WCHAR* m_keyword;
 };
 
 const FX_WCHAR* XFA_FM_KeywordToString(XFA_FM_TOKEN op);
 
 class CXFA_FMToken {
  public:
   CXFA_FMToken();
-  explicit CXFA_FMToken(FX_DWORD uLineNum);
+  explicit CXFA_FMToken(uint32_t uLineNum);
 
   CFX_WideStringC m_wstring;
   XFA_FM_TOKEN m_type;
-  FX_DWORD m_uLinenum;
+  uint32_t m_uLinenum;
 };
 
 class CXFA_FMLexer {
  public:
   CXFA_FMLexer(const CFX_WideStringC& wsFormcalc, CXFA_FMErrorInfo* pErrorInfo);
   CXFA_FMToken* NextToken();
-  FX_DWORD Number(CXFA_FMToken* t, const FX_WCHAR* p, const FX_WCHAR*& pEnd);
-  FX_DWORD String(CXFA_FMToken* t, const FX_WCHAR* p, const FX_WCHAR*& pEnd);
-  FX_DWORD Identifiers(CXFA_FMToken* t,
+  uint32_t Number(CXFA_FMToken* t, const FX_WCHAR* p, const FX_WCHAR*& pEnd);
+  uint32_t String(CXFA_FMToken* t, const FX_WCHAR* p, const FX_WCHAR*& pEnd);
+  uint32_t Identifiers(CXFA_FMToken* t,
                        const FX_WCHAR* p,
                        const FX_WCHAR*& pEnd);
   void Comment(const FX_WCHAR* p, const FX_WCHAR*& pEnd);
   XFA_FM_TOKEN IsKeyword(const CFX_WideStringC& p);
-  void SetCurrentLine(FX_DWORD line) { m_uCurrentLine = line; }
+  void SetCurrentLine(uint32_t line) { m_uCurrentLine = line; }
   void SetToken(CXFA_FMToken* pToken) {
     if (m_pToken.get() != pToken)
       m_pToken.reset(pToken);
   }
   const FX_WCHAR* SavePos() { return m_ptr; }
   void RestorePos(const FX_WCHAR* pPos) { m_ptr = pPos; }
   void Error(XFA_FM_ERRMSG msg, ...);
   FX_BOOL HasError() const;
 
  protected:
   CXFA_FMToken* Scan();
 
   const FX_WCHAR* m_ptr;
-  FX_DWORD m_uCurrentLine;
+  uint32_t m_uCurrentLine;
   std::unique_ptr<CXFA_FMToken> m_pToken;
   CXFA_FMErrorInfo* m_pErrorInfo;
 };
 
 #endif  // XFA_FXFA_FM2JS_XFA_LEXER_H_