From d7e5cc754a937605d1f73db5e7967c58ddd80742 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 10 Jun 2015 14:33:37 -0700 Subject: Merge to XFA: Remove typdefs for pointer types in fx_system.h. Original Review URL: https://codereview.chromium.org/1171733003 R=thestig@chromium.org Review URL: https://codereview.chromium.org/1178613002. --- xfa/src/fdp/include/fde_xml.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'xfa/src/fdp/include/fde_xml.h') diff --git a/xfa/src/fdp/include/fde_xml.h b/xfa/src/fdp/include/fde_xml.h index eddb9a1835..2ffa30c0fd 100644 --- a/xfa/src/fdp/include/fde_xml.h +++ b/xfa/src/fdp/include/fde_xml.h @@ -51,7 +51,7 @@ public: virtual int32_t CountChildNodes() const = 0; virtual IFDE_XMLNode* GetChildNode(int32_t index) const = 0; virtual int32_t GetChildNodeIndex(IFDE_XMLNode *pNode) const = 0; - virtual IFDE_XMLNode* GetPath(FX_LPCWSTR pPath, int32_t iLength = -1, FX_BOOL bQualifiedName = TRUE) const = 0; + virtual IFDE_XMLNode* GetPath(const FX_WCHAR* pPath, int32_t iLength = -1, FX_BOOL bQualifiedName = TRUE) const = 0; virtual int32_t InsertChildNode(IFDE_XMLNode *pNode, int32_t index = -1) = 0; virtual void RemoveChildNode(IFDE_XMLNode *pNode) = 0; virtual void DeleteChildren() = 0; @@ -70,14 +70,14 @@ public: virtual void GetTargetName(CFX_WideString &wsTarget) const = 0; virtual int32_t CountAttributes() const = 0; virtual FX_BOOL GetAttribute(int32_t index, CFX_WideString &wsAttriName, CFX_WideString &wsAttriValue) const = 0; - virtual FX_BOOL HasAttribute(FX_LPCWSTR pwsAttriName) const = 0; - virtual void GetString(FX_LPCWSTR pwsAttriName, CFX_WideString &wsAttriValue, FX_LPCWSTR pwsDefValue = NULL) const = 0; + virtual FX_BOOL HasAttribute(const FX_WCHAR* pwsAttriName) const = 0; + virtual void GetString(const FX_WCHAR* pwsAttriName, CFX_WideString &wsAttriValue, const FX_WCHAR* pwsDefValue = NULL) const = 0; virtual void SetString(const CFX_WideString &wsAttriName, const CFX_WideString &wsAttriValue) = 0; - virtual int32_t GetInteger(FX_LPCWSTR pwsAttriName, int32_t iDefValue = 0) const = 0; - virtual void SetInteger(FX_LPCWSTR pwsAttriName, int32_t iAttriValue) = 0; - virtual FX_FLOAT GetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fDefValue = 0) const = 0; - virtual void SetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fAttriValue) = 0; - virtual void RemoveAttribute(FX_LPCWSTR pwsAttriName) = 0; + virtual int32_t GetInteger(const FX_WCHAR* pwsAttriName, int32_t iDefValue = 0) const = 0; + virtual void SetInteger(const FX_WCHAR* pwsAttriName, int32_t iAttriValue) = 0; + virtual FX_FLOAT GetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fDefValue = 0) const = 0; + virtual void SetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fAttriValue) = 0; + virtual void RemoveAttribute(const FX_WCHAR* pwsAttriName) = 0; virtual int32_t CountData() const = 0; virtual FX_BOOL GetData(int32_t index, CFX_WideString &wsData) const = 0; virtual void AppendData(const CFX_WideString &wsData) = 0; @@ -93,14 +93,14 @@ public: virtual void GetNamespaceURI(CFX_WideString &wsNamespace) const = 0; virtual int32_t CountAttributes() const = 0; virtual FX_BOOL GetAttribute(int32_t index, CFX_WideString &wsAttriName, CFX_WideString &wsAttriValue) const = 0; - virtual FX_BOOL HasAttribute(FX_LPCWSTR pwsAttriName) const = 0; - virtual void GetString(FX_LPCWSTR pwsAttriName, CFX_WideString &wsAttriValue, FX_LPCWSTR pwsDefValue = NULL) const = 0; + virtual FX_BOOL HasAttribute(const FX_WCHAR* pwsAttriName) const = 0; + virtual void GetString(const FX_WCHAR* pwsAttriName, CFX_WideString &wsAttriValue, const FX_WCHAR* pwsDefValue = NULL) const = 0; virtual void SetString(const CFX_WideString &wsAttriName, const CFX_WideString &wsAttriValue) = 0; - virtual int32_t GetInteger(FX_LPCWSTR pwsAttriName, int32_t iDefValue = 0) const = 0; - virtual void SetInteger(FX_LPCWSTR pwsAttriName, int32_t iAttriValue) = 0; - virtual FX_FLOAT GetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fDefValue = 0) const = 0; - virtual void SetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fAttriValue) = 0; - virtual void RemoveAttribute(FX_LPCWSTR pwsAttriName) = 0; + virtual int32_t GetInteger(const FX_WCHAR* pwsAttriName, int32_t iDefValue = 0) const = 0; + virtual void SetInteger(const FX_WCHAR* pwsAttriName, int32_t iAttriValue) = 0; + virtual FX_FLOAT GetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fDefValue = 0) const = 0; + virtual void SetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fAttriValue) = 0; + virtual void RemoveAttribute(const FX_WCHAR* pwsAttriName) = 0; virtual void GetTextData(CFX_WideString &wsText) const = 0; virtual void SetTextData(const CFX_WideString &wsText) = 0; }; @@ -124,7 +124,7 @@ public: virtual void SetCharData(const CFX_WideString &wsCData) = 0; }; typedef struct _FDE_XMLREADERHANDLER { - FX_LPVOID pData; + void* pData; void (*OnTagEnter)(_FDE_XMLREADERHANDLER *pThis, FDE_XMLNODETYPE eType, const CFX_WideString &wsTagName); void (*OnTagBreak)(_FDE_XMLREADERHANDLER *pThis, const CFX_WideString &wsTagName); -- cgit v1.2.3