Remove FX_DWORD from XFA, part 2

xfa/fgas/crt/fgas_utils.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_FGAS_CRT_FGAS_UTILS_H_
 #define XFA_FGAS_CRT_FGAS_UTILS_H_
 
 #include "core/fxcrt/include/fx_coordinates.h"
@@ skipping 66 matching lines @@
     return CFX_BaseArray::Copy(src, iStart, iCount);
   }
   int32_t RemoveLast(int32_t iCount = -1) {
     return CFX_BaseArray::RemoveLast(iCount);
   }
   void RemoveAll(FX_BOOL bLeaveMemory = FALSE) {
     CFX_BaseArray::RemoveAll(bLeaveMemory);
   }
 };
 typedef CFX_BaseArrayTemplate<void*> CFDE_PtrArray;
-typedef CFX_BaseArrayTemplate<FX_DWORD> CFDE_DWordArray;
+typedef CFX_BaseArrayTemplate<uint32_t> CFDE_DWordArray;
 typedef CFX_BaseArrayTemplate<uint16_t> CFDE_WordArray;
 
 template <class baseType>
 class CFX_ObjectBaseArrayTemplate : public CFX_BaseArray {
  public:
   CFX_ObjectBaseArrayTemplate(int32_t iGrowSize = 100)
       : CFX_BaseArray(iGrowSize, sizeof(baseType)) {}
   ~CFX_ObjectBaseArrayTemplate() { RemoveAll(FALSE); }
   int32_t GetSize() const { return CFX_BaseArray::GetSize(); }
   int32_t GetBlockSize() const { return CFX_BaseArray::GetBlockSize(); }
@@ skipping 176 matching lines @@
   }
   int32_t RemoveLast(int32_t iCount = -1) {
     return CFX_BaseMassArray::RemoveLast(iCount);
   }
   void RemoveAll(FX_BOOL bLeaveMemory = FALSE) {
     CFX_BaseMassArray::RemoveAll(bLeaveMemory);
   }
 };
 typedef CFX_MassArrayTemplate<void*> CFX_PtrMassArray;
 typedef CFX_MassArrayTemplate<int32_t> CFX_Int32MassArray;
-typedef CFX_MassArrayTemplate<FX_DWORD> CFX_DWordMassArray;
+typedef CFX_MassArrayTemplate<uint32_t> CFX_DWordMassArray;
 typedef CFX_MassArrayTemplate<uint16_t> CFX_WordMassArray;
 typedef CFX_MassArrayTemplate<CFX_Rect> CFX_RectMassArray;
 typedef CFX_MassArrayTemplate<CFX_RectF> CFX_RectFMassArray;
 
 template <class baseType>
 class CFX_ObjectMassArrayTemplate : public CFX_BaseMassArray {
  public:
   CFX_ObjectMassArrayTemplate(int32_t iChunkSize = 100)
       : CFX_BaseMassArray(iChunkSize, sizeof(baseType)) {}
   ~CFX_ObjectMassArrayTemplate() { RemoveAll(FALSE); }
@@ skipping 94 matching lines @@
   }
   baseType* GetPtrAt(int32_t index) const {
     return (baseType*)CFX_BaseDiscreteArray::GetAt(index);
   }
   void SetAtGrow(int32_t index, const baseType& element) {
     *(baseType*)CFX_BaseDiscreteArray::AddSpaceTo(index) = element;
   }
   void RemoveAll() { CFX_BaseDiscreteArray::RemoveAll(); }
 };
 typedef CFX_DiscreteArrayTemplate<void*> CFX_PtrDiscreteArray;
-typedef CFX_DiscreteArrayTemplate<FX_DWORD> CFX_DWordDiscreteArray;
+typedef CFX_DiscreteArrayTemplate<uint32_t> CFX_DWordDiscreteArray;
 typedef CFX_DiscreteArrayTemplate<uint16_t> CFX_WordDiscreteArray;
 
 class CFX_BaseStack : public CFX_Target {
  protected:
   CFX_BaseStack(int32_t iChunkSize, int32_t iBlockSize);
   ~CFX_BaseStack();
   uint8_t* Push();
   void Pop();
   uint8_t* GetTopElement() const;
   int32_t GetSize() const;
@@ skipping 18 matching lines @@
   }
   int32_t GetSize() const { return CFX_BaseStack::GetSize(); }
   baseType* GetAt(int32_t index) const {
     return (baseType*)CFX_BaseStack::GetAt(index);
   }
   void RemoveAll(FX_BOOL bLeaveMemory = FALSE) {
     CFX_BaseStack::RemoveAll(bLeaveMemory);
   }
 };
 typedef CFX_StackTemplate<void*> CFX_PtrStack;
-typedef CFX_StackTemplate<FX_DWORD> CFX_DWordStack;
+typedef CFX_StackTemplate<uint32_t> CFX_DWordStack;
 typedef CFX_StackTemplate<uint16_t> CFX_WordStack;
 typedef CFX_StackTemplate<int32_t> CFX_Int32Stack;
 
 template <class baseType>
 class CFX_ObjectStackTemplate : public CFX_BaseStack {
  public:
   CFX_ObjectStackTemplate(int32_t iChunkSize = 100)
       : CFX_BaseStack(iChunkSize, sizeof(baseType)) {}
   ~CFX_ObjectStackTemplate() { RemoveAll(); }
   int32_t Push(const baseType& element) {
@@ skipping 279 matching lines @@
       pLast->SetNextNode(pChild);
     }
     return pChild;
   }
 
  protected:
   CPLTreeNode m_Root;
 };
 
 #endif  // XFA_FGAS_CRT_FGAS_UTILS_H_