From c777f486f84611d2fdd2d03af661b14955f9efb6 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 4 May 2016 17:57:03 -0700 Subject: Convert FWL_ERR into an enum class. This Cl updates FWL_ERR to be an FWL_Error enum class. It removes FX_ERR and replaces it with FWL_Error as well as the values were the same. There were many places where we either returned other values for FWL_ERR results. This Cl is the same as: https://codereview.chromium.org/1943413002/ but I seem to have messed up the base URL in that one. TBR=tsepez@chromium.org Review-Url: https://codereview.chromium.org/1952693003 --- xfa/fwl/basewidget/ifwl_edit.h | 46 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'xfa/fwl/basewidget/ifwl_edit.h') diff --git a/xfa/fwl/basewidget/ifwl_edit.h b/xfa/fwl/basewidget/ifwl_edit.h index 3b25eaf548..87f55d7d1e 100644 --- a/xfa/fwl/basewidget/ifwl_edit.h +++ b/xfa/fwl/basewidget/ifwl_edit.h @@ -102,30 +102,30 @@ class IFWL_Edit : public IFWL_Widget { static IFWL_Edit* CreateComboEdit(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); - FWL_ERR SetText(const CFX_WideString& wsText); + FWL_Error SetText(const CFX_WideString& wsText); int32_t GetTextLength() const; - FWL_ERR GetText(CFX_WideString& wsText, - int32_t nStart = 0, - int32_t nCount = -1) const; - FWL_ERR ClearText(); + FWL_Error GetText(CFX_WideString& wsText, + int32_t nStart = 0, + int32_t nCount = -1) const; + FWL_Error ClearText(); int32_t GetCaretPos() const; int32_t SetCaretPos(int32_t nIndex, FX_BOOL bBefore = TRUE); - FWL_ERR AddSelRange(int32_t nStart, int32_t nCount = -1); + FWL_Error AddSelRange(int32_t nStart, int32_t nCount = -1); int32_t CountSelRanges(); int32_t GetSelRange(int32_t nIndex, int32_t& nStart); - FWL_ERR ClearSelections(); + FWL_Error ClearSelections(); int32_t GetLimit(); - FWL_ERR SetLimit(int32_t nLimit); - FWL_ERR SetAliasChar(FX_WCHAR wAlias); - FWL_ERR SetFormatString(const CFX_WideString& wsFormat); - FWL_ERR Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLen); - FWL_ERR DeleteSelections(); - FWL_ERR DeleteRange(int32_t nStart, int32_t nCount = -1); - 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); + FWL_Error SetLimit(int32_t nLimit); + FWL_Error SetAliasChar(FX_WCHAR wAlias); + FWL_Error SetFormatString(const CFX_WideString& wsFormat); + FWL_Error Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLen); + FWL_Error DeleteSelections(); + FWL_Error DeleteRange(int32_t nStart, int32_t nCount = -1); + FWL_Error ReplaceSelections(const CFX_WideStringC& wsReplace); + FWL_Error Replace(int32_t nStart, + int32_t nLen, + const CFX_WideStringC& wsReplace); + FWL_Error DoClipboard(int32_t iCmd); FX_BOOL Copy(CFX_WideString& wsCopy); FX_BOOL Cut(CFX_WideString& wsCut); FX_BOOL Paste(const CFX_WideString& wsPaste); @@ -136,11 +136,11 @@ class IFWL_Edit : public IFWL_Widget { FX_BOOL Redo(); FX_BOOL CanUndo(); FX_BOOL CanRedo(); - FWL_ERR SetTabWidth(FX_FLOAT fTabWidth, FX_BOOL bEquidistant); - FWL_ERR SetOuter(IFWL_Widget* pOuter); - FWL_ERR SetNumberRange(int32_t iMin, int32_t iMax); - FWL_ERR SetBackColor(uint32_t dwColor); - FWL_ERR SetFont(const CFX_WideString& wsFont, FX_FLOAT fSize); + FWL_Error SetTabWidth(FX_FLOAT fTabWidth, FX_BOOL bEquidistant); + FWL_Error SetOuter(IFWL_Widget* pOuter); + FWL_Error SetNumberRange(int32_t iMin, int32_t iMax); + FWL_Error SetBackColor(uint32_t dwColor); + FWL_Error SetFont(const CFX_WideString& wsFont, FX_FLOAT fSize); void SetScrollOffset(FX_FLOAT fScrollOffset); FX_BOOL GetSuggestWords(CFX_PointF pointf, std::vector& sSuggest); -- cgit v1.2.3