From ca3ac5e9ffc936066267fbb1c329e5297d8e23e6 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 10 Jun 2015 17:38:11 -0700 Subject: Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs. Nearly automatic merge + re-run script on new files. Original Review URL: https://codereview.chromium.org/1180593004. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1174303002. --- xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h | 6 +++--- xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h | 2 +- xfa/include/fwl/adapter/fwl_sdadapterimp.h | 2 +- xfa/include/fwl/basewidget/fwl_combobox.h | 4 ++-- xfa/include/fwl/basewidget/fwl_edit.h | 6 +++--- xfa/include/fwl/basewidget/fxmath_barcode.h | 4 ++-- xfa/include/fwl/core/fwl_app.h | 2 +- xfa/include/fwl/core/fwl_note.h | 2 +- xfa/include/fwl/core/fwl_target.h | 2 +- xfa/include/fwl/lightwidget/checkbox.h | 2 +- xfa/include/fwl/lightwidget/combobox.h | 10 +++++----- xfa/include/fwl/lightwidget/datetimepicker.h | 2 +- xfa/include/fwl/lightwidget/edit.h | 6 +++--- xfa/include/fwl/lightwidget/listbox.h | 4 ++-- xfa/include/fwl/lightwidget/pushbutton.h | 2 +- xfa/include/fwl/lightwidget/tooltipctrl.h | 2 +- xfa/include/fwl/lightwidget/widget.h | 2 +- xfa/include/fwl/theme/widgettp.h | 6 +++--- 18 files changed, 33 insertions(+), 33 deletions(-) (limited to 'xfa/include/fwl') diff --git a/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h b/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h index 1ad09eda96..943d7caa12 100644 --- a/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h +++ b/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h @@ -26,11 +26,11 @@ public: virtual int32_t GetDataSize(FWL_HCLIPBOARDDATA hData) = 0; virtual void* LockDataBuffer(FWL_HCLIPBOARDDATA hData) = 0; virtual FX_BOOL UnLockDataBuffer(FWL_HCLIPBOARDDATA hData) = 0; - virtual FWL_ERR SetStringData(FX_WSTR ws) = 0; - virtual FWL_ERR SetStringData(FX_BSTR bs) = 0; + virtual FWL_ERR SetStringData(const CFX_WideStringC& ws) = 0; + virtual FWL_ERR SetStringData(const CFX_ByteStringC& bs) = 0; virtual FWL_ERR GetStringData(CFX_WideString &ws) = 0; virtual FWL_ERR GetStringData(CFX_ByteString &bs) = 0; virtual FWL_ERR EnumFormats(CFX_DWordArray &formats) = 0; - virtual FX_DWORD RegisterFormat(FX_WSTR wsFormat) = 0; + virtual FX_DWORD RegisterFormat(const CFX_WideStringC& wsFormat) = 0; }; #endif diff --git a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h index bff8e8a885..603e931084 100644 --- a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h +++ b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h @@ -24,7 +24,7 @@ public: virtual FWL_ERR SetWidgetPosition(IFWL_Widget *pWidget, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FWL_ERR SetParentWidget(IFWL_Widget *pWidget, IFWL_Widget *pParent) = 0; virtual FWL_ERR SetWidgetIcon(IFWL_Widget *pWidget, const CFX_DIBitmap *pIcon, FX_BOOL bBig) = 0; - virtual FWL_ERR SetWidgetCaption(IFWL_Widget *pWidget, FX_WSTR wsCaption) = 0; + virtual FWL_ERR SetWidgetCaption(IFWL_Widget *pWidget, const CFX_WideStringC& wsCaption) = 0; virtual FWL_ERR SetBorderRegion(IFWL_Widget *pWidget, CFX_Path *pPath) = 0; virtual FWL_ERR SetTransparent(IFWL_Widget *pWidget, FX_DWORD dwAlpha) = 0; virtual FWL_ERR ShowWidget(IFWL_Widget *pWidget) = 0; diff --git a/xfa/include/fwl/adapter/fwl_sdadapterimp.h b/xfa/include/fwl/adapter/fwl_sdadapterimp.h index ba14ae66c6..733a14da33 100644 --- a/xfa/include/fwl/adapter/fwl_sdadapterimp.h +++ b/xfa/include/fwl/adapter/fwl_sdadapterimp.h @@ -37,7 +37,7 @@ public: public: virtual FWL_ERR GetWidgetRect(IFWL_Widget *pWidget, CFX_RectF &rect); virtual FWL_ERR SetWidgetIcon(IFWL_Widget *pWidget, const CFX_DIBitmap *pIcon, FX_BOOL bBig); - virtual FWL_ERR SetWidgetCaption(IFWL_Widget *pWidget, FX_WSTR wsCaption); + virtual FWL_ERR SetWidgetCaption(IFWL_Widget *pWidget, const CFX_WideStringC& wsCaption); virtual FWL_ERR SetBorderRegion(IFWL_Widget *pWidget, CFX_Path *pPath); virtual FWL_ERR SetTransparent(IFWL_Widget *pWidget, FX_DWORD dwAlpha); virtual FWL_ERR SetFullScreen(IFWL_Widget *pWidget, FX_BOOL bFullScreen); diff --git a/xfa/include/fwl/basewidget/fwl_combobox.h b/xfa/include/fwl/basewidget/fwl_combobox.h index 950189bbba..ddccd6bea3 100644 --- a/xfa/include/fwl/basewidget/fwl_combobox.h +++ b/xfa/include/fwl/basewidget/fwl_combobox.h @@ -112,8 +112,8 @@ public: int32_t GetEditLimit(); FWL_ERR SetEditLimit(int32_t nLimit); FWL_ERR EditDoClipboard(int32_t iCmd); - FX_BOOL EditRedo(FX_BSTR bsRecord); - FX_BOOL EditUndo(FX_BSTR bsRecord); + FX_BOOL EditRedo(const CFX_ByteStringC& bsRecord); + FX_BOOL EditUndo(const CFX_ByteStringC& bsRecord); IFWL_ListBox* GetListBoxt(); FX_BOOL AfterFocusShowDropList(); FX_ERR OpenDropDownList(FX_BOOL bActivate); diff --git a/xfa/include/fwl/basewidget/fwl_edit.h b/xfa/include/fwl/basewidget/fwl_edit.h index ae8aea0bd3..82b0055322 100644 --- a/xfa/include/fwl/basewidget/fwl_edit.h +++ b/xfa/include/fwl/basewidget/fwl_edit.h @@ -144,8 +144,8 @@ public: FX_BOOL Cut(CFX_WideString &wsCut); FX_BOOL Paste(const CFX_WideString &wsPaste); FX_BOOL Delete(); - FX_BOOL Redo(FX_BSTR bsRecord); - FX_BOOL Undo(FX_BSTR bsRecord); + FX_BOOL Redo(const CFX_ByteStringC& bsRecord); + FX_BOOL Undo(const CFX_ByteStringC& bsRecord); FX_BOOL Undo(); FX_BOOL Redo(); FX_BOOL CanUndo(); @@ -157,7 +157,7 @@ public: FWL_ERR SetFont(const CFX_WideString &wsFont, FX_FLOAT fSize); void SetScrollOffset(FX_FLOAT fScrollOffset); FX_BOOL GetSuggestWords(CFX_PointF pointf, CFX_ByteStringArray &sSuggest); - FX_BOOL ReplaceSpellCheckWord(CFX_PointF pointf, FX_BSTR bsReplace); + FX_BOOL ReplaceSpellCheckWord(CFX_PointF pointf, const CFX_ByteStringC& bsReplace); protected: IFWL_Edit(); virtual ~IFWL_Edit(); diff --git a/xfa/include/fwl/basewidget/fxmath_barcode.h b/xfa/include/fwl/basewidget/fxmath_barcode.h index 3fcd341892..15babc8253 100644 --- a/xfa/include/fwl/basewidget/fxmath_barcode.h +++ b/xfa/include/fwl/basewidget/fxmath_barcode.h @@ -11,7 +11,7 @@ class IFX_Barcode public: virtual void Release() = 0; virtual BC_TYPE GetType() = 0; - virtual FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e) = 0; + virtual FX_BOOL Encode(const CFX_WideStringC& contents, FX_BOOL isDevice, int32_t &e) = 0; virtual FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e) = 0; virtual FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e) = 0; virtual CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t height, int32_t &errorCode) = 0; @@ -21,7 +21,7 @@ public: virtual FX_BOOL SetModuleWidth(int32_t moduleWidth) = 0; virtual FX_BOOL SetHeight(int32_t height) = 0; virtual FX_BOOL SetWidth(int32_t width) = 0; - virtual FX_BOOL CheckContentValidity(FX_WSTR contents) = 0; + virtual FX_BOOL CheckContentValidity(const CFX_WideStringC& contents) = 0; virtual FX_BOOL SetPrintChecksum(FX_BOOL checksum) = 0; virtual FX_BOOL SetDataLength(int32_t length) = 0; virtual FX_BOOL SetCalChecksum(int32_t state) = 0; diff --git a/xfa/include/fwl/core/fwl_app.h b/xfa/include/fwl/core/fwl_app.h index b0cb1857e4..bc38db0854 100644 --- a/xfa/include/fwl/core/fwl_app.h +++ b/xfa/include/fwl/core/fwl_app.h @@ -29,7 +29,7 @@ void FWL_SetApp(IFWL_App *pApp); IFWL_AdapterNative* FWL_GetAdapterNative(); IFWL_AdapterWidgetMgr* FWL_GetAdapterWidgetMgr(); IFWL_ThemeProvider* FWL_GetThemeProvider(); -extern FWL_ERR FWL_Execute(FX_WSTR wsExecutable, FX_WSTR wsParameters); +extern FWL_ERR FWL_Execute(const CFX_WideStringC& wsExecutable, const CFX_WideStringC& wsParameters); FWL_ERR FWL_SetFullScreen(IFWL_Widget *pWidget, FX_BOOL bFullScreen); FX_BOOL FWL_AppIsActived(); #endif diff --git a/xfa/include/fwl/core/fwl_note.h b/xfa/include/fwl/core/fwl_note.h index c3dcead1e4..ea8328fffb 100644 --- a/xfa/include/fwl/core/fwl_note.h +++ b/xfa/include/fwl/core/fwl_note.h @@ -146,7 +146,7 @@ public: { return 0; } - virtual FX_BOOL IsInstance(FX_WSTR wsClass) const + virtual FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const { return TRUE; } diff --git a/xfa/include/fwl/core/fwl_target.h b/xfa/include/fwl/core/fwl_target.h index d04a1f9c75..7ba7bf7cda 100644 --- a/xfa/include/fwl/core/fwl_target.h +++ b/xfa/include/fwl/core/fwl_target.h @@ -15,7 +15,7 @@ public: FX_DWORD GetRefCount() const; FWL_ERR GetClassName(CFX_WideString &wsClass) const; FX_DWORD GetClassID() const; - FX_BOOL IsInstance(FX_WSTR wsClass) const; + FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const; FWL_ERR Initialize(); FWL_ERR Finalize(); protected: diff --git a/xfa/include/fwl/lightwidget/checkbox.h b/xfa/include/fwl/lightwidget/checkbox.h index ebad96fd8e..f06750821f 100644 --- a/xfa/include/fwl/lightwidget/checkbox.h +++ b/xfa/include/fwl/lightwidget/checkbox.h @@ -18,7 +18,7 @@ public: FWL_ERR Initialize(const CFWL_WidgetProperties *pProperties = NULL); FWL_ERR GetCaption(CFX_WideString &wsCaption); - FWL_ERR SetCaption(FX_WSTR wsCaption); + FWL_ERR SetCaption(const CFX_WideStringC& wsCaption); FWL_ERR SetBoxSize(FX_FLOAT fHeight); int32_t GetCheckState(); FWL_ERR SetCheckState(int32_t iCheck); diff --git a/xfa/include/fwl/lightwidget/combobox.h b/xfa/include/fwl/lightwidget/combobox.h index fe1b5c4f25..fc09f63af0 100644 --- a/xfa/include/fwl/lightwidget/combobox.h +++ b/xfa/include/fwl/lightwidget/combobox.h @@ -17,15 +17,15 @@ class CFWL_ComboBox : public CFWL_Widget public: static CFWL_ComboBox* Create(); FWL_ERR Initialize(const CFWL_WidgetProperties *pProperties = NULL); - int32_t AddString(FX_WSTR wsText); - int32_t AddString(FX_WSTR wsText, CFX_DIBitmap *pIcon); + int32_t AddString(const CFX_WideStringC& wsText); + int32_t AddString(const CFX_WideStringC& wsText, CFX_DIBitmap *pIcon); int32_t RemoveAt(int32_t iIndex); int32_t RemoveAll(); int32_t CountItems(); FWL_ERR GetTextByIndex(int32_t iIndex, CFX_WideString &wsText); int32_t GetCurSel(); FWL_ERR SetCurSel(int32_t iSel); - FWL_ERR SetEditText(FX_WSTR wsText); + FWL_ERR SetEditText(const CFX_WideStringC& wsText); int32_t GetEditTextLength() const; FWL_ERR GetEditText(CFX_WideString &wsText, int32_t nStart = 0, int32_t nCount = -1) const ; FWL_ERR SetEditSelRange(int32_t nStart, int32_t nCount = -1); @@ -33,8 +33,8 @@ public: int32_t GetEditLimit(); FWL_ERR SetEditLimit(int32_t nLimit); FWL_ERR EditDoClipboard(int32_t iCmd); - FX_BOOL EditRedo(FX_BSTR bsRecord); - FX_BOOL EditUndo(FX_BSTR bsRecord); + FX_BOOL EditRedo(const CFX_ByteStringC& bsRecord); + FX_BOOL EditUndo(const CFX_ByteStringC& bsRecord); FWL_ERR SetMaxListHeight(FX_FLOAT fMaxHeight); FWL_ERR SetItemData(int32_t iIndex, void* pData); void* GetItemData(int32_t iIndex); diff --git a/xfa/include/fwl/lightwidget/datetimepicker.h b/xfa/include/fwl/lightwidget/datetimepicker.h index 4af07a99bc..13d223cf8e 100644 --- a/xfa/include/fwl/lightwidget/datetimepicker.h +++ b/xfa/include/fwl/lightwidget/datetimepicker.h @@ -18,7 +18,7 @@ public: FWL_ERR Initialize(const CFWL_WidgetProperties *pProperties = NULL); FWL_ERR SetToday(int32_t iYear, int32_t iMonth, int32_t iDay); FWL_ERR GetEditText(CFX_WideString &wsText); - FWL_ERR SetEditText(FX_WSTR wsText); + FWL_ERR SetEditText(const CFX_WideStringC& wsText); int32_t CountSelRanges(); int32_t GetSelRange(int32_t nIndex, int32_t &nStart); FWL_ERR GetCurSel(int32_t &iYear, int32_t &iMonth, int32_t &iDay); diff --git a/xfa/include/fwl/lightwidget/edit.h b/xfa/include/fwl/lightwidget/edit.h index 94a4ac48e4..06c10728b0 100644 --- a/xfa/include/fwl/lightwidget/edit.h +++ b/xfa/include/fwl/lightwidget/edit.h @@ -34,8 +34,8 @@ public: FWL_ERR ReplaceSelections(const CFX_WideStringC &wsReplace); FWL_ERR Replace(int32_t nStart, int32_t nLen, const CFX_WideStringC &wsReplace); FWL_ERR DoClipboard(int32_t iCmd); - FX_BOOL Redo(FX_BSTR bsRecord); - FX_BOOL Undo(FX_BSTR bsRecord); + FX_BOOL Redo(const CFX_ByteStringC& bsRecord); + FX_BOOL Undo(const CFX_ByteStringC& bsRecord); FWL_ERR SetTabWidth(FX_FLOAT fTabWidth, FX_BOOL bEquidistant); FWL_ERR SetNumberRange(int32_t iMin, int32_t iMax); FWL_ERR SetBackColor(FX_DWORD dwColor); @@ -50,7 +50,7 @@ public: FX_BOOL Delete(); void SetScrollOffset(FX_FLOAT fScrollOffset); FX_BOOL GetSuggestWords(CFX_PointF pointf, CFX_ByteStringArray &sSuggest); - FX_BOOL ReplaceSpellCheckWord(CFX_PointF pointf, FX_BSTR bsReplace); + FX_BOOL ReplaceSpellCheckWord(CFX_PointF pointf, const CFX_ByteStringC& bsReplace); CFWL_Edit(); virtual ~CFWL_Edit(); }; diff --git a/xfa/include/fwl/lightwidget/listbox.h b/xfa/include/fwl/lightwidget/listbox.h index 839bc18a9a..d095e0e5e3 100644 --- a/xfa/include/fwl/lightwidget/listbox.h +++ b/xfa/include/fwl/lightwidget/listbox.h @@ -17,7 +17,7 @@ public: static CFWL_ListBox* Create(); FWL_ERR Initialize(const CFWL_WidgetProperties *pProperties = NULL); FWL_ERR AddDIBitmap(CFX_DIBitmap * pDIB, FWL_HLISTITEM hItem); - FWL_HLISTITEM AddString(FX_WSTR wsAdd, FX_BOOL bSelect = FALSE); + FWL_HLISTITEM AddString(const CFX_WideStringC& wsAdd, FX_BOOL bSelect = FALSE); FX_BOOL DeleteString(FWL_HLISTITEM hItem); FX_BOOL DeleteAll(); int32_t CountSelItems(); @@ -32,7 +32,7 @@ public: FWL_ERR* Sort(IFWL_ListBoxCompare *pCom); int32_t CountItems(); FWL_HLISTITEM GetItem(int32_t nIndex); - FWL_ERR SetItemString(FWL_HLISTITEM hItem, FX_WSTR wsText); + FWL_ERR SetItemString(FWL_HLISTITEM hItem, const CFX_WideStringC& wsText); FWL_ERR GetItemString(FWL_HLISTITEM hItem, CFX_WideString &wsText); FWL_ERR SetItemData(FWL_HLISTITEM hItem, void* pData); void* GetItemData(FWL_HLISTITEM hItem); diff --git a/xfa/include/fwl/lightwidget/pushbutton.h b/xfa/include/fwl/lightwidget/pushbutton.h index a7c2a13cfa..feb9450951 100644 --- a/xfa/include/fwl/lightwidget/pushbutton.h +++ b/xfa/include/fwl/lightwidget/pushbutton.h @@ -17,7 +17,7 @@ public: static CFWL_PushButton* Create(); FWL_ERR Initialize(const CFWL_WidgetProperties *pProperties = NULL); FWL_ERR GetCaption(CFX_WideString &wsCaption); - FWL_ERR SetCaption(FX_WSTR wsCaption); + FWL_ERR SetCaption(const CFX_WideStringC& wsCaption); CFX_DIBitmap* GetPicture(); FWL_ERR SetPicture(CFX_DIBitmap *pBitmap); CFWL_PushButton(); diff --git a/xfa/include/fwl/lightwidget/tooltipctrl.h b/xfa/include/fwl/lightwidget/tooltipctrl.h index 821e042533..703283963b 100644 --- a/xfa/include/fwl/lightwidget/tooltipctrl.h +++ b/xfa/include/fwl/lightwidget/tooltipctrl.h @@ -17,7 +17,7 @@ public: static CFWL_ToolTip* Create(); FWL_ERR Initialize(const CFWL_WidgetProperties *pProperties = NULL); FWL_ERR GetCaption(CFX_WideString &wsCaption); - FWL_ERR SetCaption(FX_WSTR wsCaption); + FWL_ERR SetCaption(const CFX_WideStringC& wsCaption); int32_t GetInitialDelay(); int32_t SetInitialDelay(int32_t nDelayTime); int32_t GetAutoPopDelay(); diff --git a/xfa/include/fwl/lightwidget/widget.h b/xfa/include/fwl/lightwidget/widget.h index b6bd62bb2a..8f1246ba41 100644 --- a/xfa/include/fwl/lightwidget/widget.h +++ b/xfa/include/fwl/lightwidget/widget.h @@ -44,7 +44,7 @@ public: FX_DWORD GetRefCount() const; FWL_ERR GetClassName(CFX_WideString &wsClass) const; FX_DWORD GetClassID() const; - virtual FX_BOOL IsInstance(FX_WSTR wsClass) const; + virtual FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const; protected: FWL_ERR Initialize(const CFWL_WidgetProperties *pProperties = NULL); public: diff --git a/xfa/include/fwl/theme/widgettp.h b/xfa/include/fwl/theme/widgettp.h index 9d0578478e..6460b2bd57 100644 --- a/xfa/include/fwl/theme/widgettp.h +++ b/xfa/include/fwl/theme/widgettp.h @@ -96,8 +96,8 @@ class CFWL_FontData public: CFWL_FontData(); virtual ~CFWL_FontData(); - FX_BOOL Equal(FX_WSTR wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage); - FX_BOOL LoadFont(FX_WSTR wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage); + FX_BOOL Equal(const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage); + FX_BOOL LoadFont(const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage); IFX_Font* GetFont() const { return m_pFont; @@ -117,7 +117,7 @@ class CFWL_FontManager public: CFWL_FontManager(); virtual ~CFWL_FontManager(); - IFX_Font* FindFont(FX_WSTR wsFontFamily, FX_DWORD dwFontStyles, FX_WORD dwCodePage); + IFX_Font* FindFont(const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles, FX_WORD dwCodePage); protected: CFX_PtrArray m_arrFonts; }; -- cgit v1.2.3