Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.
[pdfium.git] / xfa / include / fxfa / fxfa_basic.h
index b157fff..7b635e0 100644 (file)
@@ -83,7 +83,7 @@ typedef struct _XFA_PACKETINFO {
     FX_DWORD                                   eFlags;\r
 } XFA_PACKETINFO, * XFA_LPPACKETINFO;\r
 typedef XFA_PACKETINFO const * XFA_LPCPACKETINFO;\r
-XFA_LPCPACKETINFO XFA_GetPacketByName(FX_WSTR wsName);\r
+XFA_LPCPACKETINFO XFA_GetPacketByName(const CFX_WideStringC& wsName);\r
 XFA_LPCPACKETINFO XFA_GetPacketByID(FX_DWORD dwPacket);\r
 extern const XFA_PACKETINFO g_XFAPacketData[];\r
 inline XFA_LPCPACKETINFO XFA_GetPacketByIndex(XFA_PACKET ePacket)\r
@@ -927,7 +927,7 @@ typedef struct _XFA_ELEMENTINFO {
 } XFA_ELEMENTINFO, * XFA_LPELEMENTINFO;\r
 typedef XFA_ELEMENTINFO const * XFA_LPCELEMENTINFO;\r
 int32_t XFA_GetElementCount();\r
-XFA_LPCELEMENTINFO XFA_GetElementByName(FX_WSTR wsName);\r
+XFA_LPCELEMENTINFO XFA_GetElementByName(const CFX_WideStringC& wsName);\r
 XFA_LPCELEMENTINFO XFA_GetElementByID(XFA_ELEMENT eName);\r
 enum XFA_ATTRIBUTETYPE {\r
     XFA_ATTRIBUTETYPE_NOTSURE,\r
@@ -947,7 +947,7 @@ typedef struct _XFA_ATTRIBUTEINFO {
 } XFA_ATTRIBUTEINFO, * XFA_LPATTRIBUTEINFO;\r
 typedef XFA_ATTRIBUTEINFO const * XFA_LPCATTRIBUTEINFO;\r
 int32_t XFA_GetAttributeCount();\r
-XFA_LPCATTRIBUTEINFO XFA_GetAttributeByName(FX_WSTR wsName);\r
+XFA_LPCATTRIBUTEINFO XFA_GetAttributeByName(const CFX_WideStringC& wsName);\r
 XFA_LPCATTRIBUTEINFO XFA_GetAttributeByID(XFA_ATTRIBUTE eName);\r
 FX_BOOL XFA_GetAttributeDefaultValue(void* &pValue, XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, XFA_ATTRIBUTETYPE eType, FX_DWORD dwPacket);\r
 XFA_ATTRIBUTEENUM      XFA_GetAttributeDefaultValue_Enum(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);\r
@@ -989,7 +989,7 @@ typedef struct _XFA_ATTRIBUTEENUMINFO {
     XFA_ATTRIBUTEENUM                  eName;\r
 } XFA_ATTRIBUTEENUMINFO, * XFA_LPATTRIBUTEENUMINFO;\r
 typedef XFA_ATTRIBUTEENUMINFO const * XFA_LPCATTRIBUTEENUMINFO;\r
-XFA_LPCATTRIBUTEENUMINFO XFA_GetAttributeEnumByName(FX_WSTR wsName);\r
+XFA_LPCATTRIBUTEENUMINFO XFA_GetAttributeEnumByName(const CFX_WideStringC& wsName);\r
 XFA_LPCATTRIBUTEENUMINFO XFA_GetAttributeEnumByID(XFA_ATTRIBUTEENUM eName);\r
 enum XFA_UNIT {\r
     XFA_UNIT_Unknown,\r
@@ -1006,7 +1006,7 @@ enum XFA_UNIT {
 class CXFA_Measurement\r
 {\r
 public:\r
-    void                                               Set(FX_WSTR wsMeasure);\r
+    void                                               Set(const CFX_WideStringC& wsMeasure);\r
     void                                               Set(FX_FLOAT fValue, XFA_UNIT eUnit)\r
     {\r
         m_fValue = fValue;\r
@@ -1032,7 +1032,7 @@ public:
     {\r
         Set(-1, XFA_UNIT_Unknown);\r
     }\r
-    CXFA_Measurement(FX_WSTR wsMeasure)\r
+    CXFA_Measurement(const CFX_WideStringC& wsMeasure)\r
     {\r
         Set(wsMeasure);\r
     }\r
@@ -1040,7 +1040,7 @@ public:
     {\r
         Set(fValue, eUnit);\r
     }\r
-    static XFA_UNIT                            GetUnit(FX_WSTR wsUnit);\r
+    static XFA_UNIT                            GetUnit(const CFX_WideStringC& wsUnit);\r
 protected:\r
     FX_FLOAT                                   m_fValue;\r
     XFA_UNIT                                   m_eUnit;\r
@@ -1055,7 +1055,7 @@ typedef struct _XFA_METHODINFO {
 } XFA_METHODINFO, * XFA_LPMETHODINFO;\r
 typedef XFA_METHODINFO const * XFA_LPCMETHODINFO;\r
 int32_t XFA_GetMethodCount();\r
-XFA_LPCMETHODINFO XFA_GetMethodByName(XFA_ELEMENT eElement,    FX_WSTR wsMethodName);\r
+XFA_LPCMETHODINFO XFA_GetMethodByName(XFA_ELEMENT eElement,    const CFX_WideStringC& wsMethodName);\r
 typedef void (CXFA_Object::*XFA_ATTRIBUTE_CALLBACK) (FXJSE_HVALUE hValue, FX_BOOL bSetting, XFA_ATTRIBUTE eAttribute);\r
 enum XFA_SCRIPT_TYPE {\r
     XFA_SCRIPT_Basic,\r
@@ -1069,5 +1069,5 @@ typedef struct _XFA_SCRIPTATTRIBUTEINFO {
     FX_WORD                                                    eValueType;\r
 } XFA_SCRIPTATTRIBUTEINFO, * XFA_LPSCRIPTATTRIBUTEINFO;\r
 typedef XFA_SCRIPTATTRIBUTEINFO const * XFA_LPCSCRIPTATTRIBUTEINFO;\r
-XFA_LPCSCRIPTATTRIBUTEINFO XFA_GetScriptAttributeByName(XFA_ELEMENT eElement, FX_WSTR wsAttributeName);\r
+XFA_LPCSCRIPTATTRIBUTEINFO XFA_GetScriptAttributeByName(XFA_ELEMENT eElement, const CFX_WideStringC& wsAttributeName);\r
 #endif\r