Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.
[pdfium.git] / xfa / src / fxfa / src / parser / xfa_script_resolveprocessor.h
index 3555b0a..fc13aa9 100644 (file)
@@ -31,9 +31,9 @@ public:
     CXFA_ScriptContext*                        m_pSC;\r
     CXFA_Object*                               m_CurNode;\r
     CFX_WideString                             m_wsName;\r
-    FX_UINT32                                  m_uHashName;\r
+    uint32_t                                   m_uHashName;\r
     CFX_WideString                             m_wsCondition;\r
-    FX_INT32                                   m_nLevel;\r
+    int32_t                                    m_nLevel;\r
     CXFA_ObjArray                              m_Nodes;\r
     FX_DWORD                                   m_dwStyles;\r
     XFA_LPCSCRIPTATTRIBUTEINFO m_pScriptAttribute;\r
@@ -44,22 +44,22 @@ class CXFA_ResolveProcessor
 public:\r
     CXFA_ResolveProcessor(void);\r
     ~CXFA_ResolveProcessor(void);\r
-    FX_INT32   XFA_ResolveNodes(CXFA_ResolveNodesData &rnd);\r
-    FX_INT32   XFA_ResolveNodes_AnyChild(CXFA_ResolveNodesData &rnd);\r
-    FX_INT32   XFA_ResolveNodes_Dollar(CXFA_ResolveNodesData &rnd);\r
-    FX_INT32   XFA_ResolveNodes_Excalmatory(CXFA_ResolveNodesData &rnd);\r
-    FX_INT32   XFA_ResolveNodes_NumberSign(CXFA_ResolveNodesData &rnd);\r
-    FX_INT32   XFA_ResolveNodes_Asterisk(CXFA_ResolveNodesData &rnd);\r
-    FX_INT32   XFA_ResolveNodes_Normal(CXFA_ResolveNodesData &rnd);\r
-    FX_INT32   XFA_ResolveNodes_ForAttributeRs(CXFA_Object* curNode, CXFA_ResolveNodesData &rnd, FX_WSTR strAttr);\r
-    void               XFA_ResolveNode_ConditionArray(FX_INT32 iCurIndex, CFX_WideString wsCondition, FX_INT32 iFoundCount, CXFA_ResolveNodesData &rnd);\r
-    void               XFA_ResolveNode_DoPredicateFilter(FX_INT32 iCurIndex, CFX_WideString wsCondition, FX_INT32 iFoundCount, CXFA_ResolveNodesData &rnd);\r
-    FX_INT32   XFA_ResolveNodes_GetFilter(FX_WSTR wsExpression, FX_INT32 nStart, CXFA_ResolveNodesData &rnd);\r
+    int32_t    XFA_ResolveNodes(CXFA_ResolveNodesData &rnd);\r
+    int32_t    XFA_ResolveNodes_AnyChild(CXFA_ResolveNodesData &rnd);\r
+    int32_t    XFA_ResolveNodes_Dollar(CXFA_ResolveNodesData &rnd);\r
+    int32_t    XFA_ResolveNodes_Excalmatory(CXFA_ResolveNodesData &rnd);\r
+    int32_t    XFA_ResolveNodes_NumberSign(CXFA_ResolveNodesData &rnd);\r
+    int32_t    XFA_ResolveNodes_Asterisk(CXFA_ResolveNodesData &rnd);\r
+    int32_t    XFA_ResolveNodes_Normal(CXFA_ResolveNodesData &rnd);\r
+    int32_t    XFA_ResolveNodes_ForAttributeRs(CXFA_Object* curNode, CXFA_ResolveNodesData &rnd, const CFX_WideStringC& strAttr);\r
+    void               XFA_ResolveNode_ConditionArray(int32_t iCurIndex, CFX_WideString wsCondition, int32_t iFoundCount, CXFA_ResolveNodesData &rnd);\r
+    void               XFA_ResolveNode_DoPredicateFilter(int32_t iCurIndex, CFX_WideString wsCondition, int32_t iFoundCount, CXFA_ResolveNodesData &rnd);\r
+    int32_t    XFA_ResolveNodes_GetFilter(const CFX_WideStringC& wsExpression, int32_t nStart, CXFA_ResolveNodesData &rnd);\r
     void               XFA_ResolveNode_FilterCondition(CXFA_ResolveNodesData &rnd, CFX_WideString wsCondition);\r
-    FX_INT32   XFA_ResolveNodes_PopStack(CFX_Int32Array &stack);\r
+    int32_t    XFA_ResolveNodes_PopStack(CFX_Int32Array &stack);\r
     void               XFA_ResolveNodes_SetStylesForChild(FX_DWORD dwParentStyles, CXFA_ResolveNodesData &rnd);\r
-    FX_INT32   XFA_ResolveNode_SetResultCreateNode(XFA_RESOLVENODE_RS& resolveNodeRS, CFX_WideString &wsLastCondition);\r
-    void           XFA_ResolveNode_SetIndexDataBind(CFX_WideString &wsNextCondition, FX_INT32 &iIndex, FX_INT32 iCount);\r
+    int32_t    XFA_ResolveNode_SetResultCreateNode(XFA_RESOLVENODE_RS& resolveNodeRS, CFX_WideString &wsLastCondition);\r
+    void           XFA_ResolveNode_SetIndexDataBind(CFX_WideString &wsNextCondition, int32_t &iIndex, int32_t iCount);\r
     CXFA_NodeHelper* GetNodeHelper()\r
     {\r
         return m_pNodeHelper;\r
@@ -67,6 +67,6 @@ public:
 private:\r
     CXFA_NodeHelper* m_pNodeHelper;\r
 public:\r
-    FX_INT32            m_iCurStart;\r
+    int32_t             m_iCurStart;\r
 };\r
 #endif\r